/[svn]/ircd-hybrid-8/src/s_serv.c
ViewVC logotype

Diff of /ircd-hybrid-8/src/s_serv.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1471 by michael, Tue Jul 17 21:33:12 2012 UTC revision 1472 by michael, Sun Jul 22 12:03:18 2012 UTC
# Line 437  check_server(const char *name, struct Cl Line 437  check_server(const char *name, struct Cl
437    server_aconf = map_to_conf(server_conf);    server_aconf = map_to_conf(server_conf);
438    
439    if (!IsConfTopicBurst(server_aconf))    if (!IsConfTopicBurst(server_aconf))
440      ClearCap(client_p, CAP_TB | CAP_TBURST);      ClearCap(client_p, CAP_TBURST);
441    
442    if (aconf != NULL)    if (aconf != NULL)
443    {    {
# Line 769  server_estab(struct Client *client_p) Line 769  server_estab(struct Client *client_p)
769       */       */
770    
771      send_capabilities(client_p, aconf,      send_capabilities(client_p, aconf,
772        (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));        (IsConfTopicBurst(aconf) ? CAP_TBURST : 0));
773    
774      sendto_one(client_p, "SERVER %s 1 :%s%s",      sendto_one(client_p, "SERVER %s 1 :%s%s",
775                 me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);                 me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
# Line 988  burst_all(struct Client *client_p) Line 988  burst_all(struct Client *client_p)
988        burst_members(client_p, chptr);        burst_members(client_p, chptr);
989        send_channel_modes(client_p, chptr);        send_channel_modes(client_p, chptr);
990    
991        if (IsCapable(client_p, CAP_TBURST) ||        if (IsCapable(client_p, CAP_TBURST))
           IsCapable(client_p, CAP_TB))  
992          send_tb(client_p, chptr);          send_tb(client_p, chptr);
993      }      }
994    }    }
# Line 1021  burst_all(struct Client *client_p) Line 1020  burst_all(struct Client *client_p)
1020   *              - pointer to channel   *              - pointer to channel
1021   * output       - NONE   * output       - NONE
1022   * side effects - Called on a server burst when   * side effects - Called on a server burst when
1023   *                server is CAP_TB|CAP_TBURST capable   *                server is CAP_TBURST capable
1024   */   */
1025  static void  static void
1026  send_tb(struct Client *client_p, struct Channel *chptr)  send_tb(struct Client *client_p, struct Channel *chptr)
# Line 1040  send_tb(struct Client *client_p, struct Line 1039  send_tb(struct Client *client_p, struct
1039     * for further information   -Michael     * for further information   -Michael
1040     */     */
1041    if (chptr->topic_time != 0)    if (chptr->topic_time != 0)
1042    {      sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1043      if (IsCapable(client_p, CAP_TBURST))                 ID_or_name(&me, client_p),
1044        sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",                 (unsigned long)chptr->channelts, chptr->chname,
1045                   me.name, (unsigned long)chptr->channelts, chptr->chname,                 (unsigned long)chptr->topic_time,
1046                   (unsigned long)chptr->topic_time,                 chptr->topic_info,
1047                   chptr->topic_info,                 chptr->topic);
                  chptr->topic);  
     else if (IsCapable(client_p, CAP_TB))  
       sendto_one(client_p, ":%s TB %s %lu %s :%s",  
                  me.name, chptr->chname,  
                  (unsigned long)chptr->topic_time,  
                  chptr->topic_info, chptr->topic);  
   }  
1048  }  }
1049    
1050  /* burst_members()  /* burst_members()
# Line 1330  finish_ssl_server_handshake(struct Clien Line 1322  finish_ssl_server_handshake(struct Clien
1322                 aconf->spasswd, TS_CURRENT, me.id);                 aconf->spasswd, TS_CURRENT, me.id);
1323    
1324    send_capabilities(client_p, aconf,    send_capabilities(client_p, aconf,
1325                     (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));                     (IsConfTopicBurst(aconf) ? CAP_TBURST : 0));
1326    
1327    sendto_one(client_p, "SERVER %s 1 :%s%s",    sendto_one(client_p, "SERVER %s 1 :%s%s",
1328               me.name, ConfigServerHide.hidden ? "(H) " : "",               me.name, ConfigServerHide.hidden ? "(H) " : "",
# Line 1492  serv_connect_callback(fde_t *fd, int sta Line 1484  serv_connect_callback(fde_t *fd, int sta
1484                 aconf->spasswd, TS_CURRENT, me.id);                 aconf->spasswd, TS_CURRENT, me.id);
1485    
1486    send_capabilities(client_p, aconf,    send_capabilities(client_p, aconf,
1487                     (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));                     (IsConfTopicBurst(aconf) ? CAP_TBURST : 0));
1488    
1489    sendto_one(client_p, "SERVER %s 1 :%s%s",    sendto_one(client_p, "SERVER %s 1 :%s%s",
1490               me.name, ConfigServerHide.hidden ? "(H) " : "",               me.name, ConfigServerHide.hidden ? "(H) " : "",

Legend:
Removed from v.1471  
changed lines
  Added in v.1472

svnadmin@ircd-hybrid.org
ViewVC Help
Powered by ViewVC 1.1.28