activated the new features

[srvx.git] / src / proto-p10.c

diff --git a/src/proto-p10.c b/src/proto-p10.c
index 29bf7ac7f515cf2f8b14764c47901fdf07fbdb66..4d5c4c9cbb206669b28ecdd44ea7276e2e7e7ac4 100644 (file)
--- a/src/proto-p10.c
+++ b/src/proto-p10.c
@@ -508,7 +508,7 @@ irc_fakehost(struct userNode *user, const char *host, const char *ident, int for
     /* SRVX added the possibility for FAKE IDENTS
      * but this is currently *NOT* supported by our IRCu
      */
-    int useNewFakehost = 0;
+    int useNewFakehost = 1;
      
     if(useNewFakehost) putsock("%s " P10_FAKEHOST2 " %s %s %s%s", self->numeric, user->numeric, ident, host, force ? " FORCE" : "");
     else putsock("%s " P10_FAKEHOST " %s %s", self->numeric, user->numeric, host);
@@ -702,12 +702,16 @@ irc_introduce(const char *passwd)
 void
 irc_gline(struct server *srv, struct gline *gline)
 {
+    //<prefix> GL <target> [!][+|-|>|<]<mask> [<expiration>] [<lastmod>] [<lifetime>] [:<reason>]
+    //expiration = relative time (seconds)
+    //lastmod = timestamp
+    //livetime = timestamp
     if (gline->lastmod)
-        putsock("%s " P10_GLINE " %s +%s %lu %lu %lu :%s",
-                self->numeric, (srv ? srv->numeric : "*"), gline->target, gline->expires, gline->lastmod, gline->lifetime, gline->reason);
+        putsock("%s " P10_GLINE " %s +%s %lu %lu %lu :%s", self->numeric, (srv ? srv->numeric : "*"), 
+                gline->target, gline->expires-now, gline->lastmod, gline->lifetime, gline->reason);
     else
-        putsock("%s " P10_GLINE " %s +%s %lu :%s",
-                self->numeric, (srv ? srv->numeric : "*"), gline->target, gline->expires, gline->reason);
+        putsock("%s " P10_GLINE " %s +%s %lu :%s", self->numeric, (srv ? srv->numeric : "*"), 
+                gline->target, gline->expires-now, gline->reason);
 }
 
 void