commit - e8dacb68dc1c496afe4d14897f0a2e7898fa4900
commit + 98e9467c85b1a81fbbcebf2be21b3a0d83fb60c4
blob - 265a9859e04bfaa95b06d53d2cbce02b26767d16
blob + 6ca3c33288ebfd595084cf77a28863974957abbc
--- src/ngircd/irc-server.c
+++ src/ngircd/irc-server.c
CHANNEL *chan;
CLIENT *c;
- assert( Client != NULL );
- assert( Req != NULL );
+ assert(Client != NULL);
+ assert(Req != NULL);
- strlcpy( nick_in, Req->argv[1], sizeof( nick_in ));
- strcpy( nick_out, "" );
+ strlcpy(nick_in, Req->argv[1], sizeof(nick_in));
+ strcpy(nick_out, "");
channame = Req->argv[0];
- ptr = strtok( nick_in, "," );
- while( ptr )
- {
+
+ ptr = strtok(nick_in, ",");
+ while (ptr) {
is_owner = is_chanadmin = is_op = is_halfop = is_voiced = false;
/* cut off prefixes */
- while(( *ptr == '~') || ( *ptr == '&' ) || ( *ptr == '@' ) ||
- ( *ptr == '%') || ( *ptr == '+' ))
- {
- if( *ptr == '~' ) is_owner = true;
- if( *ptr == '&' ) is_chanadmin = true;
- if( *ptr == '@' ) is_op = true;
- if( *ptr == '%' ) is_halfop = true;
- if( *ptr == '+' ) is_voiced = true;
+ while ((*ptr == '~') || (*ptr == '&') || (*ptr == '@') ||
+ (*ptr == '%') || (*ptr == '+')) {
+ if (*ptr == '~')
+ is_owner = true;
+ if (*ptr == '&')
+ is_chanadmin = true;
+ if (*ptr == '@')
+ is_op = true;
+ if (*ptr == '%')
+ is_halfop = true;
+ if (*ptr == '+')
+ is_voiced = true;
ptr++;
}
- c = Client_Search( ptr );
- if( c )
- {
- Channel_Join( c, channame );
- chan = Channel_Search( channame );
- assert( chan != NULL );
+ c = Client_Search(ptr);
+ if (!c) {
+ /* Client not found? */
+ Log(LOG_ERR,
+ "Got NJOIN for unknown nick \"%s\" for channel \"%s\"!",
+ ptr, channame);
+ goto skip_njoin;
+ }
- if( is_owner ) Channel_UserModeAdd( chan, c, 'q' );
- if( is_chanadmin ) Channel_UserModeAdd( chan, c, 'a' );
- if( is_op ) Channel_UserModeAdd( chan, c, 'o' );
- if( is_halfop ) Channel_UserModeAdd( chan, c, 'h' );
- if( is_voiced ) Channel_UserModeAdd( chan, c, 'v' );
+ Channel_Join(c, channame);
+ chan = Channel_Search(channame);
+ assert(chan != NULL);
- /* announce to channel... */
- IRC_WriteStrChannelPrefix( Client, chan, c, false, "JOIN :%s", channame );
+ if (is_owner)
+ Channel_UserModeAdd(chan, c, 'q');
+ if (is_chanadmin)
+ Channel_UserModeAdd(chan, c, 'a');
+ if (is_op)
+ Channel_UserModeAdd(chan, c, 'o');
+ if (is_halfop)
+ Channel_UserModeAdd(chan, c, 'h');
+ if (is_voiced)
+ Channel_UserModeAdd(chan, c, 'v');
- /* set Channel-User-Modes */
- strlcpy( modes, Channel_UserModes( chan, c ), sizeof( modes ));
- if( modes[0] )
- {
- /* send modes to channel */
- IRC_WriteStrChannelPrefix( Client, chan, Client, false, "MODE %s +%s %s", channame, modes, Client_ID( c ));
- }
+ /* Announce client to the channel */
+ IRC_WriteStrChannelPrefix(Client, chan, c, false,
+ "JOIN :%s", channame);
- if( nick_out[0] != '\0' ) strlcat( nick_out, ",", sizeof( nick_out ));
- if( is_owner ) strlcat( nick_out, "~", sizeof( nick_out ));
- if( is_chanadmin ) strlcat( nick_out, "&", sizeof( nick_out ));
- if( is_op ) strlcat( nick_out, "@", sizeof( nick_out ));
- if( is_halfop ) strlcat( nick_out, "%", sizeof( nick_out ));
- if( is_voiced ) strlcat( nick_out, "+", sizeof( nick_out ));
- strlcat( nick_out, ptr, sizeof( nick_out ));
- }
- else Log( LOG_ERR, "Got NJOIN for unknown nick \"%s\" for channel \"%s\"!", ptr, channame );
+ /* Announce "channel user modes" to the channel, if any */
+ strlcpy(modes, Channel_UserModes(chan, c), sizeof(modes));
+ if (modes[0])
+ IRC_WriteStrChannelPrefix(Client, chan, Client, false,
+ "MODE %s +%s %s", channame,
+ modes, Client_ID(c));
- /* search for next Nick */
- ptr = strtok( NULL, "," );
+ /* Build nick list for forwarding command */
+ if (nick_out[0] != '\0')
+ strlcat(nick_out, ",", sizeof(nick_out));
+ if (is_owner)
+ strlcat(nick_out, "~", sizeof(nick_out));
+ if (is_chanadmin)
+ strlcat(nick_out, "&", sizeof(nick_out));
+ if (is_op)
+ strlcat(nick_out, "@", sizeof(nick_out));
+ if (is_halfop)
+ strlcat(nick_out, "%", sizeof(nick_out));
+ if (is_voiced)
+ strlcat(nick_out, "+", sizeof(nick_out));
+ strlcat(nick_out, ptr, sizeof(nick_out));
+
+ skip_njoin:
+ /* Get next nick, if any ... */
+ ptr = strtok(NULL, ",");
}
/* forward to other servers */
