Propagate +6 flag across network. Show correct error when outbound connections fail.

[ircu2.10.12-pk.git] / ircd / s_serv.c

diff --git a/ircd/s_serv.c b/ircd/s_serv.c
index 14ea9868076c91ad6a3b333c0af1e1425ab284bd..9e64c518b36de4cd7b7c88a533b09c10c41ae403 100644 (file)
--- a/ircd/s_serv.c
+++ b/ircd/s_serv.c
@@ -193,10 +193,10 @@ int server_estab(struct Client *cptr, struct ConfItem *aconf)
     if (!match(cli_name(&me), cli_name(cptr)))
       continue;
     sendcmdto_one(&me, CMD_SERVER, acptr,
-                 "%s 2 0 %Tu J%02u %s%s +%s%s :%s", cli_name(cptr),
+                 "%s 2 0 %Tu J%02u %s%s +%s%s%s :%s", cli_name(cptr),
                  cli_serv(cptr)->timestamp, Protocol(cptr), NumServCap(cptr),
                  IsHub(cptr) ? "h" : "", IsService(cptr) ? "s" : "",
-                 cli_info(cptr));
+                 IsIPv6(cptr) ? "6" : "", cli_info(cptr));
   }
 
   /* Send these as early as possible so that glined users/juped servers can
@@ -236,11 +236,11 @@ int server_estab(struct Client *cptr, struct ConfItem *aconf)
       if (0 == match(cli_name(&me), cli_name(acptr)))
         continue;
       sendcmdto_one(cli_serv(acptr)->up, CMD_SERVER, cptr,
-                   "%s %d 0 %Tu %s%u %s%s +%s%s :%s", cli_name(acptr),
+                   "%s %d 0 %Tu %s%u %s%s +%s%s%s :%s", cli_name(acptr),
                    cli_hopcount(acptr) + 1, cli_serv(acptr)->timestamp,
                    protocol_str, Protocol(acptr), NumServCap(acptr),
                    IsHub(acptr) ? "h" : "", IsService(acptr) ? "s" : "",
-                   cli_info(acptr));
+                   IsIPv6(acptr) ? "6" : "", cli_info(acptr));
     }
   }