Changes in irc_commands.c [ec2ebcc:81186cab]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
irc_commands.c
rec2ebcc r81186cab 2 2 * BitlBee -- An IRC to other IM-networks gateway * 3 3 * * 4 * Copyright 2002-20 06Wilmer van der Gaast and others *4 * Copyright 2002-2010 Wilmer van der Gaast and others * 5 5 \********************************************************************/ 6 6 … … 53 53 else if( global.conf->auth_pass ) 54 54 { 55 irc_ reply( irc, 464, ":Incorrect password" );55 irc_send_num( irc, 464, ":Incorrect password" ); 56 56 } 57 57 else 58 58 { 59 59 /* Remember the password and try to identify after USER/NICK. */ 60 irc_setpass( irc, cmd[1] );60 /*irc_setpass( irc, cmd[1] ); */ 61 61 irc_check_login( irc ); 62 62 } … … 65 65 static void irc_cmd_user( irc_t *irc, char **cmd ) 66 66 { 67 irc->user = g_strdup( cmd[1] );68 irc-> realname = g_strdup( cmd[4] );67 irc->user->user = g_strdup( cmd[1] ); 68 irc->user->fullname = g_strdup( cmd[4] ); 69 69 70 70 irc_check_login( irc ); … … 73 73 static void irc_cmd_nick( irc_t *irc, char **cmd ) 74 74 { 75 if( irc->nick ) 76 { 77 irc_reply( irc, 438, ":The hand of the deity is upon thee, thy nick may not change" ); 78 } 79 /* This is not clean, but for now it'll have to be like this... */ 80 else if( ( nick_cmp( cmd[1], irc->mynick ) == 0 ) || ( nick_cmp( cmd[1], NS_NICK ) == 0 ) ) 81 { 82 irc_reply( irc, 433, ":This nick is already in use" ); 75 if( irc_user_by_name( irc, cmd[1] ) ) 76 { 77 irc_send_num( irc, 433, ":This nick is already in use" ); 83 78 } 84 79 else if( !nick_ok( cmd[1] ) ) 85 80 { 86 81 /* [SH] Invalid characters. */ 87 irc_reply( irc, 432, ":This nick contains invalid characters" ); 88 } 89 else 90 { 91 irc->nick = g_strdup( cmd[1] ); 82 irc_send_num( irc, 432, ":This nick contains invalid characters" ); 83 } 84 else if( irc->user->nick ) 85 { 86 if( irc->status & USTATUS_IDENTIFIED ) 87 { 88 irc_setpass( irc, NULL ); 89 irc->status &= ~USTATUS_IDENTIFIED; 90 irc_umode_set( irc, "-R", 1 ); 91 } 92 93 irc_user_set_nick( irc->user, cmd[1] ); 94 } 95 else 96 { 97 irc->user->nick = g_strdup( cmd[1] ); 92 98 93 99 irc_check_login( irc ); … … 105 111 static void irc_cmd_ping( irc_t *irc, char **cmd ) 106 112 { 107 irc_write( irc, ":%s PONG %s :%s", irc->myhost, irc->myhost, cmd[1]?cmd[1]:irc->myhost ); 108 } 109 110 static void irc_cmd_oper( irc_t *irc, char **cmd ) 111 { 112 if( global.conf->oper_pass && 113 ( strncmp( global.conf->oper_pass, "md5:", 4 ) == 0 ? 114 md5_verify_password( cmd[2], global.conf->oper_pass + 4 ) == 0 : 115 strcmp( cmd[2], global.conf->oper_pass ) == 0 ) ) 116 { 117 irc_umode_set( irc, "+o", 1 ); 118 irc_reply( irc, 381, ":Password accepted" ); 119 } 120 else 121 { 122 irc_reply( irc, 432, ":Incorrect password" ); 123 } 113 irc_write( irc, ":%s PONG %s :%s", irc->root->host, 114 irc->root->host, cmd[1]?cmd[1]:irc->root->host ); 115 } 116 117 static void irc_cmd_pong( irc_t *irc, char **cmd ) 118 { 119 /* We could check the value we get back from the user, but in 120 fact we don't care, we're just happy s/he's still alive. */ 121 irc->last_pong = gettime(); 122 irc->pinging = 0; 123 } 124 125 static void irc_cmd_join( irc_t *irc, char **cmd ) 126 { 127 irc_channel_t *ic; 128 129 if( ( ic = irc_channel_by_name( irc, cmd[1] ) ) == NULL ) 130 ic = irc_channel_new( irc, cmd[1] ); 131 132 if( ic == NULL ) 133 { 134 irc_send_num( irc, 479, "%s :Invalid channel name", cmd[1] ); 135 return; 136 } 137 138 if( ic->flags & IRC_CHANNEL_JOINED ) 139 return; /* Dude, you're already there... 140 RFC doesn't have any reply for that though? */ 141 142 irc_channel_add_user( ic, irc->user ); 143 } 144 145 static void irc_cmd_names( irc_t *irc, char **cmd ) 146 { 147 irc_channel_t *ic; 148 149 if( cmd[1] && ( ic = irc_channel_by_name( irc, cmd[1] ) ) ) 150 irc_send_names( ic ); 151 /* With no args, we should show /names of all chans. Make the code 152 below work well if necessary. 153 else 154 { 155 GSList *l; 156 157 for( l = irc->channels; l; l = l->next ) 158 irc_send_names( l->data ); 159 } 160 */ 161 } 162 163 static void irc_cmd_part( irc_t *irc, char **cmd ) 164 { 165 irc_channel_t *ic; 166 167 if( ( ic = irc_channel_by_name( irc, cmd[1] ) ) == NULL ) 168 { 169 irc_send_num( irc, 403, "%s :No such channel", cmd[1] ); 170 } 171 else if( !irc_channel_del_user( ic, irc->user ) ) 172 { 173 irc_send_num( irc, 442, "%s :You're not on that channel", cmd[1] ); 174 } 175 } 176 177 static void irc_cmd_whois( irc_t *irc, char **cmd ) 178 { 179 char *nick = cmd[1]; 180 irc_user_t *iu = irc_user_by_name( irc, nick ); 181 182 if( iu ) 183 irc_send_whois( iu ); 184 else 185 irc_send_num( irc, 401, "%s :Nick does not exist", nick ); 186 } 187 188 static void irc_cmd_whowas( irc_t *irc, char **cmd ) 189 { 190 /* For some reason irssi tries a whowas when whois fails. We can 191 ignore this, but then the user never gets a "user not found" 192 message from irssi which is a bit annoying. So just respond 193 with not-found and irssi users will get better error messages */ 194 195 irc_send_num( irc, 406, "%s :Nick does not exist", cmd[1] ); 196 irc_send_num( irc, 369, "%s :End of WHOWAS", cmd[1] ); 197 } 198 199 static void irc_cmd_motd( irc_t *irc, char **cmd ) 200 { 201 irc_send_motd( irc ); 124 202 } 125 203 126 204 static void irc_cmd_mode( irc_t *irc, char **cmd ) 127 205 { 128 if( strchr( CTYPES, *cmd[1] ) ) 129 { 130 if( cmd[2] ) 206 if( irc_channel_name_ok( cmd[1] ) ) 207 { 208 irc_channel_t *ic; 209 210 if( ( ic = irc_channel_by_name( irc, cmd[1] ) ) == NULL ) 211 irc_send_num( irc, 403, "%s :No such channel", cmd[1] ); 212 else if( cmd[2] ) 131 213 { 132 214 if( *cmd[2] == '+' || *cmd[2] == '-' ) 133 irc_ reply( irc, 477, "%s :Can't change channel modes", cmd[1] );215 irc_send_num( irc, 477, "%s :Can't change channel modes", cmd[1] ); 134 216 else if( *cmd[2] == 'b' ) 135 irc_ reply( irc, 368, "%s :No bans possible", cmd[1] );217 irc_send_num( irc, 368, "%s :No bans possible", cmd[1] ); 136 218 } 137 219 else 138 irc_ reply( irc, 324, "%s +%s", cmd[1], CMODE);139 } 140 else 141 { 142 if( nick_cmp( cmd[1], irc-> nick ) == 0 )220 irc_send_num( irc, 324, "%s +%s", cmd[1], ic->mode ); 221 } 222 else 223 { 224 if( nick_cmp( cmd[1], irc->user->nick ) == 0 ) 143 225 { 144 226 if( cmd[2] ) 145 227 irc_umode_set( irc, cmd[2], 0 ); 146 228 else 147 irc_ reply( irc, 221, "+%s", irc->umode );229 irc_send_num( irc, 221, "+%s", irc->umode ); 148 230 } 149 231 else 150 irc_reply( irc, 502, ":Don't touch their modes" ); 151 } 152 } 153 154 static void irc_cmd_names( irc_t *irc, char **cmd ) 155 { 156 irc_names( irc, cmd[1]?cmd[1]:irc->channel ); 157 } 158 159 static void irc_cmd_part( irc_t *irc, char **cmd ) 160 { 161 struct groupchat *c; 162 163 if( g_strcasecmp( cmd[1], irc->channel ) == 0 ) 164 { 165 user_t *u = user_find( irc, irc->nick ); 166 167 /* Not allowed to leave control channel */ 168 irc_part( irc, u, irc->channel ); 169 irc_join( irc, u, irc->channel ); 170 } 171 else if( ( c = irc_chat_by_channel( irc, cmd[1] ) ) ) 172 { 173 user_t *u = user_find( irc, irc->nick ); 174 175 irc_part( irc, u, c->channel ); 176 177 if( c->ic ) 178 { 179 c->joined = 0; 180 c->ic->acc->prpl->chat_leave( c ); 181 } 182 } 183 else 184 { 185 irc_reply( irc, 403, "%s :No such channel", cmd[1] ); 186 } 187 } 188 189 static void irc_cmd_join( irc_t *irc, char **cmd ) 190 { 191 if( g_strcasecmp( cmd[1], irc->channel ) == 0 ) 192 ; /* Dude, you're already there... 193 RFC doesn't have any reply for that though? */ 194 else if( cmd[1] ) 195 { 196 struct chat *c; 197 198 if( strchr( CTYPES, cmd[1][0] ) == NULL || cmd[1][1] == 0 ) 199 irc_reply( irc, 479, "%s :Invalid channel name", cmd[1] ); 200 else if( ( c = chat_bychannel( irc, cmd[1] ) ) && c->acc && c->acc->ic ) 201 chat_join( irc, c, cmd[2] ); 202 else 203 irc_reply( irc, 403, "%s :No such channel", cmd[1] ); 204 } 205 } 206 207 static void irc_cmd_invite( irc_t *irc, char **cmd ) 208 { 209 char *nick = cmd[1], *channel = cmd[2]; 210 struct groupchat *c = irc_chat_by_channel( irc, channel ); 211 user_t *u = user_find( irc, nick ); 212 213 if( u && c && ( u->ic == c->ic ) ) 214 if( c->ic && c->ic->acc->prpl->chat_invite ) 215 { 216 c->ic->acc->prpl->chat_invite( c, u->handle, NULL ); 217 irc_reply( irc, 341, "%s %s", nick, channel ); 218 return; 219 } 220 221 irc_reply( irc, 482, "%s :Invite impossible; User/Channel non-existent or incompatible", channel ); 232 irc_send_num( irc, 502, ":Don't touch their modes" ); 233 } 234 } 235 236 static void irc_cmd_who( irc_t *irc, char **cmd ) 237 { 238 char *channel = cmd[1]; 239 irc_channel_t *ic; 240 241 if( !channel || *channel == '0' || *channel == '*' || !*channel ) 242 irc_send_who( irc, irc->users, "**" ); 243 else if( ( ic = irc_channel_by_name( irc, channel ) ) ) 244 irc_send_who( irc, ic->users, channel ); 245 else 246 irc_send_num( irc, 403, "%s :No such channel", channel ); 222 247 } 223 248 224 249 static void irc_cmd_privmsg( irc_t *irc, char **cmd ) 225 250 { 226 if ( !cmd[2] ) 227 { 228 irc_reply( irc, 412, ":No text to send" ); 229 } 230 else if ( irc->nick && g_strcasecmp( cmd[1], irc->nick ) == 0 ) 231 { 232 irc_write( irc, ":%s!%s@%s %s %s :%s", irc->nick, irc->user, irc->host, cmd[0], cmd[1], cmd[2] ); 251 irc_channel_t *ic; 252 irc_user_t *iu; 253 254 if( !cmd[2] ) 255 { 256 irc_send_num( irc, 412, ":No text to send" ); 257 return; 258 } 259 260 /* Don't treat CTCP actions as real CTCPs, just convert them right now. */ 261 if( g_strncasecmp( cmd[2], "\001ACTION", 7 ) == 0 ) 262 { 263 cmd[2] += 4; 264 strcpy( cmd[2], "/me" ); 265 if( cmd[2][strlen(cmd[2])-1] == '\001' ) 266 cmd[2][strlen(cmd[2])-1] = '\0'; 267 } 268 269 if( irc_channel_name_ok( cmd[1] ) && 270 ( ic = irc_channel_by_name( irc, cmd[1] ) ) ) 271 { 272 if( ic->f->privmsg ) 273 ic->f->privmsg( ic, cmd[2] ); 274 } 275 else if( ( iu = irc_user_by_name( irc, cmd[1] ) ) ) 276 { 277 if( cmd[2][0] == '\001' ) 278 { 279 char **ctcp; 280 281 if( iu->f->ctcp == NULL ) 282 return; 283 if( cmd[2][strlen(cmd[2])-1] == '\001' ) 284 cmd[2][strlen(cmd[2])-1] = '\0'; 285 286 ctcp = split_command_parts( cmd[2] + 1 ); 287 iu->f->ctcp( iu, ctcp ); 288 } 289 else if( iu->f->privmsg ) 290 iu->f->privmsg( iu, cmd[2] ); 291 } 292 else 293 { 294 irc_send_num( irc, 401, "%s :No such nick/channel", cmd[1] ); 295 } 296 297 298 #if 0 299 else if( irc->nick && g_strcasecmp( cmd[1], irc->nick ) == 0 ) 300 { 233 301 } 234 302 else … … 271 339 irc_send( irc, cmd[1], cmd[2], ( g_strcasecmp( cmd[0], "NOTICE" ) == 0 ) ? OPT_AWAY : 0 ); 272 340 } 273 } 274 275 static void irc_cmd_who( irc_t *irc, char **cmd ) 276 { 277 char *channel = cmd[1]; 278 user_t *u = irc->users; 279 struct groupchat *c; 280 GList *l; 281 282 if( !channel || *channel == '0' || *channel == '*' || !*channel ) 283 while( u ) 284 { 285 irc_reply( irc, 352, "%s %s %s %s %s %c :0 %s", u->online ? irc->channel : "*", u->user, u->host, irc->myhost, u->nick, u->online ? ( u->away ? 'G' : 'H' ) : 'G', u->realname ); 286 u = u->next; 287 } 288 else if( g_strcasecmp( channel, irc->channel ) == 0 ) 289 while( u ) 290 { 291 if( u->online ) 292 irc_reply( irc, 352, "%s %s %s %s %s %c :0 %s", channel, u->user, u->host, irc->myhost, u->nick, u->away ? 'G' : 'H', u->realname ); 293 u = u->next; 294 } 295 else if( ( c = irc_chat_by_channel( irc, channel ) ) ) 296 for( l = c->in_room; l; l = l->next ) 297 { 298 if( ( u = user_findhandle( c->ic, l->data ) ) ) 299 irc_reply( irc, 352, "%s %s %s %s %s %c :0 %s", channel, u->user, u->host, irc->myhost, u->nick, u->away ? 'G' : 'H', u->realname ); 300 } 301 else if( ( u = user_find( irc, channel ) ) ) 302 irc_reply( irc, 352, "%s %s %s %s %s %c :0 %s", channel, u->user, u->host, irc->myhost, u->nick, u->online ? ( u->away ? 'G' : 'H' ) : 'G', u->realname ); 303 304 irc_reply( irc, 315, "%s :End of /WHO list", channel?channel:"**" ); 341 #endif 342 } 343 344 static void irc_cmd_nickserv( irc_t *irc, char **cmd ) 345 { 346 /* [SH] This aliases the NickServ command to PRIVMSG root */ 347 /* [TV] This aliases the NS command to PRIVMSG root as well */ 348 root_command( irc, cmd + 1 ); 349 } 350 351 352 353 #if 0 354 static void irc_cmd_oper( irc_t *irc, char **cmd ) 355 { 356 if( global.conf->oper_pass && 357 ( strncmp( global.conf->oper_pass, "md5:", 4 ) == 0 ? 358 md5_verify_password( cmd[2], global.conf->oper_pass + 4 ) == 0 : 359 strcmp( cmd[2], global.conf->oper_pass ) == 0 ) ) 360 { 361 irc_umode_set( irc, "+o", 1 ); 362 irc_send_num( irc, 381, ":Password accepted" ); 363 } 364 else 365 { 366 irc_send_num( irc, 432, ":Incorrect password" ); 367 } 368 } 369 370 static void irc_cmd_invite( irc_t *irc, char **cmd ) 371 { 372 char *nick = cmd[1], *channel = cmd[2]; 373 struct groupchat *c = irc_chat_by_channel( irc, channel ); 374 user_t *u = user_find( irc, nick ); 375 376 if( u && c && ( u->ic == c->ic ) ) 377 if( c->ic && c->ic->acc->prpl->chat_invite ) 378 { 379 c->ic->acc->prpl->chat_invite( c, u->handle, NULL ); 380 irc_send_num( irc, 341, "%s %s", nick, channel ); 381 return; 382 } 383 384 irc_send_num( irc, 482, "%s :Invite impossible; User/Channel non-existent or incompatible", channel ); 305 385 } 306 386 … … 320 400 { 321 401 if( u->online && u->away ) 322 irc_ reply( irc, 302, ":%s=-%s@%s", u->nick, u->user, u->host );402 irc_send_num( irc, 302, ":%s=-%s@%s", u->nick, u->user, u->host ); 323 403 else 324 irc_ reply( irc, 302, ":%s=+%s@%s", u->nick, u->user, u->host );404 irc_send_num( irc, 302, ":%s=+%s@%s", u->nick, u->user, u->host ); 325 405 } 326 406 } … … 377 457 buff[strlen(buff)-1] = '\0'; 378 458 379 irc_ reply( irc, 303, ":%s", buff );459 irc_send_num( irc, 303, ":%s", buff ); 380 460 } 381 461 … … 406 486 407 487 if( u && u->online ) 408 irc_ reply( irc, 604, "%s %s %s %d :%s", u->nick, u->user, u->host, (int) time( NULL ), "is online" );488 irc_send_num( irc, 604, "%s %s %s %d :%s", u->nick, u->user, u->host, (int) time( NULL ), "is online" ); 409 489 else 410 irc_ reply( irc, 605, "%s %s %s %d :%s", nick, "*", "*", (int) time( NULL ), "is offline" );490 irc_send_num( irc, 605, "%s %s %s %d :%s", nick, "*", "*", (int) time( NULL ), "is offline" ); 411 491 } 412 492 else if( cmd[i][0] == '-' ) … … 419 499 g_free( okey ); 420 500 421 irc_ reply( irc, 602, "%s %s %s %d :%s", nick, "*", "*", 0, "Stopped watching" );501 irc_send_num( irc, 602, "%s %s %s %d :%s", nick, "*", "*", 0, "Stopped watching" ); 422 502 } 423 503 } … … 443 523 } 444 524 } 525 #endif 445 526 446 527 static void irc_cmd_away( irc_t *irc, char **cmd ) 447 528 { 448 user_t *u = user_find( irc, irc->nick ); 449 char *away = cmd[1]; 450 451 if( !u ) return; 452 453 if( away && *away ) 454 { 529 char *set; 530 531 if( cmd[1] && *cmd[1] ) 532 { 533 char away[strlen(cmd[1])+1]; 455 534 int i, j; 456 535 457 536 /* Copy away string, but skip control chars. Mainly because 458 537 Jabber really doesn't like them. */ 459 u->away = g_malloc( strlen( away ) + 1 ); 460 for( i = j = 0; away[i]; i ++ ) 461 if( ( u->away[j] = away[i] ) >= ' ' ) 538 for( i = j = 0; cmd[1][i]; i ++ ) 539 if( ( away[j] = cmd[1][i] ) >= ' ' ) 462 540 j ++; 463 u->away[j] = 0; 464 465 irc_reply( irc, 306, ":You're now away: %s", u->away ); 466 /* irc_umode_set( irc, irc->myhost, "+a" ); */ 467 } 468 else 469 { 470 if( u->away ) g_free( u->away ); 471 u->away = NULL; 472 /* irc_umode_set( irc, irc->myhost, "-a" ); */ 473 irc_reply( irc, 305, ":Welcome back" ); 474 } 475 476 set_setstr( &irc->set, "away", u->away ); 477 } 478 479 static void irc_cmd_whois( irc_t *irc, char **cmd ) 480 { 481 char *nick = cmd[1]; 482 user_t *u = user_find( irc, nick ); 483 484 if( u ) 485 { 486 irc_reply( irc, 311, "%s %s %s * :%s", u->nick, u->user, u->host, u->realname ); 487 488 if( u->ic ) 489 irc_reply( irc, 312, "%s %s.%s :%s network", u->nick, u->ic->acc->user, 490 u->ic->acc->server && *u->ic->acc->server ? u->ic->acc->server : "", 491 u->ic->acc->prpl->name ); 492 else 493 irc_reply( irc, 312, "%s %s :%s", u->nick, irc->myhost, IRCD_INFO ); 494 495 if( !u->online ) 496 irc_reply( irc, 301, "%s :%s", u->nick, "User is offline" ); 497 else if( u->away ) 498 irc_reply( irc, 301, "%s :%s", u->nick, u->away ); 499 if( u->status_msg ) 500 irc_reply( irc, 320, "%s :%s", u->nick, u->status_msg ); 501 502 irc_reply( irc, 318, "%s :End of /WHOIS list", nick ); 503 } 504 else 505 { 506 irc_reply( irc, 401, "%s :Nick does not exist", nick ); 507 } 508 } 509 510 static void irc_cmd_whowas( irc_t *irc, char **cmd ) 511 { 512 /* For some reason irssi tries a whowas when whois fails. We can 513 ignore this, but then the user never gets a "user not found" 514 message from irssi which is a bit annoying. So just respond 515 with not-found and irssi users will get better error messages */ 516 517 irc_reply( irc, 406, "%s :Nick does not exist", cmd[1] ); 518 irc_reply( irc, 369, "%s :End of WHOWAS", cmd[1] ); 519 } 520 521 static void irc_cmd_nickserv( irc_t *irc, char **cmd ) 522 { 523 /* [SH] This aliases the NickServ command to PRIVMSG root */ 524 /* [TV] This aliases the NS command to PRIVMSG root as well */ 525 root_command( irc, cmd + 1 ); 526 } 527 528 static void irc_cmd_motd( irc_t *irc, char **cmd ) 529 { 530 irc_motd( irc ); 531 } 532 533 static void irc_cmd_pong( irc_t *irc, char **cmd ) 534 { 535 /* We could check the value we get back from the user, but in 536 fact we don't care, we're just happy he's still alive. */ 537 irc->last_pong = gettime(); 538 irc->pinging = 0; 539 } 540 541 away[j] = '\0'; 542 543 irc_send_num( irc, 306, ":You're now away: %s", away ); 544 set = away; 545 } 546 else 547 { 548 irc_send_num( irc, 305, ":Welcome back" ); 549 set = NULL; 550 } 551 552 set_setstr( &irc->b->set, "away", set ); 553 } 554 555 #if 0 541 556 static void irc_cmd_version( irc_t *irc, char **cmd ) 542 557 { 543 irc_ reply( irc, 351, "bitlbee-%s. %s :%s/%s ", BITLBEE_VERSION, irc->myhost, ARCH, CPU );558 irc_send_num( irc, 351, "bitlbee-%s. %s :%s/%s ", BITLBEE_VERSION, irc->myhost, ARCH, CPU ); 544 559 } 545 560 … … 572 587 ipc_to_master( cmd ); 573 588 574 irc_reply( irc, 382, "%s :Rehashing", global.conf_file ); 575 } 589 irc_send_num( irc, 382, "%s :Rehashing", global.conf_file ); 590 } 591 #endif 576 592 577 593 static const command_t irc_commands[] = { … … 581 597 { "quit", 0, irc_cmd_quit, 0 }, 582 598 { "ping", 0, irc_cmd_ping, 0 }, 599 { "pong", 0, irc_cmd_pong, IRC_CMD_LOGGED_IN }, 600 { "join", 1, irc_cmd_join, IRC_CMD_LOGGED_IN }, 601 { "names", 1, irc_cmd_names, IRC_CMD_LOGGED_IN }, 602 { "part", 1, irc_cmd_part, IRC_CMD_LOGGED_IN }, 603 { "whois", 1, irc_cmd_whois, IRC_CMD_LOGGED_IN }, 604 { "whowas", 1, irc_cmd_whowas, IRC_CMD_LOGGED_IN }, 605 { "motd", 0, irc_cmd_motd, IRC_CMD_LOGGED_IN }, 606 { "mode", 1, irc_cmd_mode, IRC_CMD_LOGGED_IN }, 607 { "who", 0, irc_cmd_who, IRC_CMD_LOGGED_IN }, 608 { "privmsg", 1, irc_cmd_privmsg, IRC_CMD_LOGGED_IN }, 609 { "nickserv", 1, irc_cmd_nickserv, IRC_CMD_LOGGED_IN }, 610 { "ns", 1, irc_cmd_nickserv, IRC_CMD_LOGGED_IN }, 611 { "away", 0, irc_cmd_away, IRC_CMD_LOGGED_IN }, 612 #if 0 583 613 { "oper", 2, irc_cmd_oper, IRC_CMD_LOGGED_IN }, 584 { "mode", 1, irc_cmd_mode, IRC_CMD_LOGGED_IN },585 { "names", 0, irc_cmd_names, IRC_CMD_LOGGED_IN },586 { "part", 1, irc_cmd_part, IRC_CMD_LOGGED_IN },587 { "join", 1, irc_cmd_join, IRC_CMD_LOGGED_IN },588 614 { "invite", 2, irc_cmd_invite, IRC_CMD_LOGGED_IN }, 589 { "privmsg", 1, irc_cmd_privmsg, IRC_CMD_LOGGED_IN },590 615 { "notice", 1, irc_cmd_privmsg, IRC_CMD_LOGGED_IN }, 591 { "who", 0, irc_cmd_who, IRC_CMD_LOGGED_IN },592 616 { "userhost", 1, irc_cmd_userhost, IRC_CMD_LOGGED_IN }, 593 617 { "ison", 1, irc_cmd_ison, IRC_CMD_LOGGED_IN }, 594 618 { "watch", 1, irc_cmd_watch, IRC_CMD_LOGGED_IN }, 595 619 { "topic", 1, irc_cmd_topic, IRC_CMD_LOGGED_IN }, 596 { "away", 0, irc_cmd_away, IRC_CMD_LOGGED_IN },597 { "whois", 1, irc_cmd_whois, IRC_CMD_LOGGED_IN },598 { "whowas", 1, irc_cmd_whowas, IRC_CMD_LOGGED_IN },599 { "nickserv", 1, irc_cmd_nickserv, IRC_CMD_LOGGED_IN },600 { "ns", 1, irc_cmd_nickserv, IRC_CMD_LOGGED_IN },601 { "motd", 0, irc_cmd_motd, IRC_CMD_LOGGED_IN },602 { "pong", 0, irc_cmd_pong, IRC_CMD_LOGGED_IN },603 620 { "version", 0, irc_cmd_version, IRC_CMD_LOGGED_IN }, 604 621 { "completions", 0, irc_cmd_completions, IRC_CMD_LOGGED_IN }, … … 610 627 { "restart", 0, NULL, IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER }, 611 628 { "kill", 2, NULL, IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER }, 629 #endif 612 630 { NULL } 613 631 }; … … 628 646 if( irc_commands[i].flags & IRC_CMD_PRE_LOGIN && irc->status & USTATUS_LOGGED_IN ) 629 647 { 630 irc_ reply( irc, 462, ":Only allowed before logging in" );648 irc_send_num( irc, 462, ":Only allowed before logging in" ); 631 649 } 632 650 else if( irc_commands[i].flags & IRC_CMD_LOGGED_IN && !( irc->status & USTATUS_LOGGED_IN ) ) 633 651 { 634 irc_ reply( irc, 451, ":Register first" );652 irc_send_num( irc, 451, ":Register first" ); 635 653 } 636 654 else if( irc_commands[i].flags & IRC_CMD_OPER_ONLY && !strchr( irc->umode, 'o' ) ) 637 655 { 638 irc_ reply( irc, 481, ":Permission denied - You're not an IRC operator" );656 irc_send_num( irc, 481, ":Permission denied - You're not an IRC operator" ); 639 657 } 640 658 else if( n_arg < irc_commands[i].required_parameters ) 641 659 { 642 irc_ reply( irc, 461, "%s :Need more parameters", cmd[0] );660 irc_send_num( irc, 461, "%s :Need more parameters", cmd[0] ); 643 661 } 644 662 else if( irc_commands[i].flags & IRC_CMD_TO_MASTER ) … … 657 675 658 676 if( irc->status >= USTATUS_LOGGED_IN ) 659 irc_ reply( irc, 421, "%s :Unknown command", cmd[0] );660 } 677 irc_send_num( irc, 421, "%s :Unknown command", cmd[0] ); 678 }
Note: See TracChangeset
for help on using the changeset viewer.