Techwizz/pvpgn-server
1
0
Fork 0
Code Issues68 Pull requests2 Projects Releases8 Packages Wiki Activity Actions

Commited patch from pelish (with minor modifications). Major

Browse source 
changes: added buddies support, fixed some WOL bugs, added support for 
Emperor battle for dune 1.09 and redalert 3.03.
This commit is contained in:
dizzy 2007-02-13 18:53:59 +00:00
parent bea94f82f9
commit f5e260a9a9
19 changed files with 550 additions and 141 deletions

1
pvpgn/conf/bnetd.conf.in
View file

@ -515,6 +515,7 @@ initkill_timer = 120
#woladdrs = ":4000"
#wservaddrs = ":4005"
#wgameresaddrs = ":4807"
# Just leave these as default (unless you know the timezone, longitiude and latitude
# of your server

1
pvpgn/conf/bnetd.conf.win32
View file

@ -493,6 +493,7 @@ initkill_timer = 120
#woladdrs = ":4000"
#wservaddrs = ":4005"
#wgameresaddrs = ":4807"
# Just leave these as default (unless you know the timezone, longitiude and latitude
# of your server

4
pvpgn/conf/channel.conf
View file

@ -77,7 +77,7 @@ NONE "Diablo II" D2XP true false false NULL NULL -1 false
"Lob 18 2" "GDI Comm. Center" TSUN false false false NULL NULL -1 false
##### Red Alert 1 Support ######################################################################################
"Lob 21 0" "Combat Alley" WWOL false false false NULL NULL -1 false
"Lob 21 0" "Combat Alley" RALT false false false NULL NULL -1 false
##### Red Alert 2 Support ######################################################################################
"Lob 33 0" "USA Command" RAL2 false false false NULL NULL -1 false
@ -91,7 +91,7 @@ NONE "Diablo II" D2XP true false false NULL NULL -1 false
"Lob 41 1" "Unknown" YURI false false false NULL NULL -1 false
##### Emperor: Battle for Dune #################################################################################
"Emperor-1" "Unknown" EMPR false false false NULL NULL -1 false
"Emperor-1" "Emperor-1" EMPR false false false NULL NULL -1 false
# #
##############################################################################

45
pvpgn/src/bnetd/channel.cpp
View file

@ -237,6 +237,7 @@ extern t_channel * channel_create(char const * fullname, char const * shortname,
channel->gameType = 0;
channel->gameTournament = 0;
channel->gameExtension = NULL;
channel->gameOptions = NULL;
@ -272,6 +273,9 @@ extern int channel_destroy(t_channel * channel, t_elem ** curr)
eventlog(eventlog_level_info,__FUNCTION__,"destroying channel \"%s\"",channel->name);
if (channel->gameExtension)
xfree(channel->gameExtension);
LIST_TRAVERSE(channel->banlist,ban)
{
char const * banned;
@ -1263,6 +1267,19 @@ extern int channel_get_max(t_channel const * channel)
return channel->maxmembers;
}
extern int channel_set_max(t_channel * channel, int maxmembers)
{
if (!channel)
{
eventlog(eventlog_level_error,__FUNCTION__,"got NULL channel");
return 0;
}
if (maxmembers)
channel->maxmembers = maxmembers;
return 1;
}
extern int channel_get_curr(t_channel const * channel)
{
if (!channel)
@ -1669,6 +1686,34 @@ extern int channel_wol_set_game_options(t_channel * channel, char const * gameOp
return 1;
}
extern char const * channel_wol_get_game_extension(t_channel const * channel)
{
if (!channel)
{
eventlog(eventlog_level_error,__FUNCTION__,"got NULL channel");
return NULL;
}
return channel->gameExtension;
}
extern int channel_wol_set_game_extension(t_channel * channel, char const * gameExtension)
{
if (!channel)
{
eventlog(eventlog_level_error,__FUNCTION__,"got NULL channel");
return -1;
}
if (channel->gameExtension)
xfree(channel->gameExtension);
channel->gameExtension = gameExtension ? xstrdup(gameExtension) : 0;
return 0;
}
}
}

5
pvpgn/src/bnetd/channel.h
View file

@ -102,6 +102,7 @@ typedef struct channel
int gameType;
int gameTournament;
char const * gameExtension;
char const * gameOptions;
}
@ -158,6 +159,7 @@ extern int channel_rejoin(t_connection * conn);
extern t_list * channel_get_banlist(t_channel const * channel);
extern int channel_get_length(t_channel const * channel);
extern int channel_get_max(t_channel const * channel);
extern int channel_set_max(t_channel * channel, int maxmembers);
extern int channel_get_curr(t_channel const * channel);
extern int channel_conn_is_tmpOP(t_channel const * channel, t_connection * c);
extern int channel_conn_has_tmpVOICE(t_channel const * channel, t_connection * c);
@ -190,6 +192,9 @@ extern int channel_wol_set_game_tournament(t_channel * channel, int tournament);
extern char const * channel_wol_get_game_options(t_channel const * channel);
extern int channel_wol_set_game_options(t_channel * channel, char const * gameOptions);
extern char const * channel_wol_get_game_extension(t_channel const * channel);
extern int channel_wol_set_game_extension(t_channel * channel, char const * gameExtension);
}
}

17
pvpgn/src/bnetd/connection.cpp
View file

@ -114,7 +114,7 @@ static void conn_send_welcome(t_connection * c)
if (c->protocol.cflags & conn_flags_welcomed)
return;
if ((conn_get_class(c)==conn_class_irc)||(conn_get_class(c)==conn_class_wol)||(conn_get_class(c)==conn_class_wserv))
if ((conn_get_class(c)==conn_class_irc)||(conn_get_class(c)==conn_class_wol)||(conn_get_class(c)==conn_class_wserv)||(conn_get_class(c)==conn_class_wgameres))
{
c->protocol.cflags|= conn_flags_welcomed;
return;
@ -196,7 +196,7 @@ extern void conn_test_latency(t_connection * c, std::time_t now, t_timer_data de
return; // state_destroy: do nothing
if ((conn_get_class(c)==conn_class_irc)||(conn_get_class(c)==conn_class_wol)||(conn_get_class(c)==conn_class_wserv)) {
if ((conn_get_class(c)==conn_class_irc)||(conn_get_class(c)==conn_class_wol)||(conn_get_class(c)==conn_class_wserv)||(conn_get_class(c)==conn_class_wgameres)) {
/* We should start pinging the client after we received the first line ... */
/* NOTE: RFC2812 only suggests that PINGs are being sent
* if no other activity is detected. However it explecitly
@ -282,6 +282,8 @@ extern char const * conn_class_get_str(t_conn_class cclass)
return "wol";
case conn_class_wserv:
return "wserv";
case conn_class_wgameres:
return "wgameres";
case conn_class_none:
return "none";
case conn_class_w3route:
@ -1948,8 +1950,7 @@ extern int conn_set_channel(t_connection * c, char const * channelname)
message_send_text(c,message_type_info,c,msgtemp);
}
if (channel_get_topic(channel_get_name(c->protocol.chat.channel)) && ((conn_get_class(c)!=conn_class_irc) ||
(conn_get_class(c)!=conn_class_wol) || (conn_get_class(c)!=conn_class_wserv)))
if (channel_get_topic(channel_get_name(c->protocol.chat.channel)) && ((conn_get_class(c)!=conn_class_irc)))
{
char msgtemp[MAX_MESSAGE_LEN];
@ -3500,7 +3501,9 @@ extern unsigned int connlist_login_get_length(void)
{
c = (const t_connection*)elem_get_data(curr);
if ((c->protocol.state==conn_state_loggedin)&&
((c->protocol.cclass==conn_class_bnet)||(c->protocol.cclass==conn_class_bot)||(c->protocol.cclass==conn_class_telnet)||(c->protocol.cclass==conn_class_irc)||(c->protocol.cclass==conn_class_wol)||(c->protocol.cclass==conn_class_wserv)))
((c->protocol.cclass==conn_class_bnet)||(c->protocol.cclass==conn_class_bot)||(c->protocol.cclass==conn_class_telnet)
||(c->protocol.cclass==conn_class_irc)||(c->protocol.cclass==conn_class_wol)||(c->protocol.cclass==conn_class_wserv)
||(c->protocol.cclass==conn_class_wgameres)))
count++;
}
@ -3950,7 +3953,7 @@ extern int conn_wol_get_findme(t_connection * c)
if (!c)
{
eventlog(eventlog_level_error,__FUNCTION__,"got NULL conn");
return -1;
return 0;
}
return c->protocol.wol.findme;
@ -3973,7 +3976,7 @@ extern int conn_wol_get_pageme(t_connection * c)
if (!c)
{
eventlog(eventlog_level_error,__FUNCTION__,"got NULL conn");
return -1;
return 0;
}
return c->protocol.wol.pageme;

7
pvpgn/src/bnetd/connection.h
View file

@ -70,9 +70,10 @@ typedef enum
conn_class_file,
conn_class_bot,
conn_class_telnet,
conn_class_irc, /* Internet Relay Chat */
conn_class_wol, /* Westwood Online */
conn_class_wserv, /* Westwood Server */
conn_class_irc, /* Internet Relay Chat */
conn_class_wol, /* Westwood IRC */
conn_class_wserv, /* Westwood servserv */
conn_class_wgameres, /* Westwood gameres */
conn_class_d2cs_bnetd,
conn_class_w3route,
conn_class_none

469
pvpgn/src/bnetd/handle_wol.cpp
View file

@ -45,6 +45,7 @@
#include "tick.h"
#include "topic.h"
#include "server.h"
#include "friends.h"
#include "common/setup_after.h"
namespace pvpgn
@ -96,6 +97,16 @@ static int _handle_startg_command(t_connection * conn, int numparams, char ** pa
static int _handle_listsearch_command(t_connection * conn, int numparams, char ** params, char * text);
static int _handle_advertr_command(t_connection * conn, int numparams, char ** params, char * text);
static int _handle_chanchk_command(t_connection * conn, int numparams, char ** params, char * text);
static int _handle_getbuddy_command(t_connection * conn, int numparams, char ** params, char * text);
static int _handle_addbuddy_command(t_connection * conn, int numparams, char ** params, char * text);
static int _handle_delbuddy_command(t_connection * conn, int numparams, char ** params, char * text);
static int _handle_time_command(t_connection * conn, int numparams, char ** params, char * text);
static int _handle_kick_command(t_connection * conn, int numparams, char ** params, char * text);
static int _handle_mode_command(t_connection * conn, int numparams, char ** params, char * text);
static int _handle_host_command(t_connection * conn, int numparams, char ** params, char * text);
static int _handle_advertc_command(t_connection * conn, int numparams, char ** params, char * text);
static int _handle_clanbyname_command(t_connection * conn, int numparams, char ** params, char * text);
static int _handle_userip_command(t_connection * conn, int numparams, char ** params, char * text);
/* state "connected" handlers */
static const t_wol_command_table_row wol_con_command_table[] =
@ -135,13 +146,23 @@ static const t_wol_command_table_row wol_log_command_table[] =
{ "GETINSIDER" , _handle_getinsider_command },
{ "JOINGAME" , _handle_joingame_command },
{ "GAMEOPT" , _handle_gameopt_command },
{ "FINDUSEREX" , _handle_finduserex_command },
{ "FINDUSER" , _handle_finduser_command },
{ "FINDUSEREX" , _handle_finduserex_command },
{ "PAGE" , _handle_page_command },
{ "STARTG" , _handle_startg_command },
{ "LISTSEARCH" , _handle_listsearch_command },
{ "ADVERTR" , _handle_advertr_command },
{ "CHANCHK" , _handle_chanchk_command },
{ "GETBUDDY" , _handle_getbuddy_command },
{ "ADDBUDDY" , _handle_addbuddy_command },
{ "DELBUDDY" , _handle_delbuddy_command },
{ "TIME" , _handle_time_command },
{ "KICK" , _handle_kick_command },
{ "MODE" , _handle_mode_command },
{ "HOST" , _handle_host_command },
{ "ADVERTC" , _handle_advertc_command },
{ "CLANBYNAME" , _handle_clanbyname_command },
{ "USERIP" , _handle_userip_command },
{ NULL , NULL }
};
@ -163,7 +184,7 @@ static int handle_wol_set_clienttag (t_connection * conn, int sku)
conn_set_clienttag(conn,CLIENTTAG_WCHAT_UINT);
// conn_set_clienttag(conn,CLIENTTAG_CNCONQUER_UINT);
return 0;
case 1005: /* Red Alert 1 v2.02 (Westwood Chat Version) */
case 1005: /* Red Alert 1 v2.00 (Westwood Chat Version) */
case 1006:
case 1007:
case 1008:
@ -203,11 +224,11 @@ static int handle_wol_set_clienttag (t_connection * conn, int sku)
case 4615:
conn_set_clienttag(conn,CLIENTTAG_TIBERNSUN_UINT);
return 0;
// case 5376: /* Red Alert 1 v3.03 (4 Players Internet Version) */
// case 5378:
// case 5379:
// conn_set_clienttag(conn,CLIENTTAG_REDALERT_UINT);
// return 0;
case 5376: /* Red Alert 1 v3.03 (4 Players Internet Version) */
case 5378:
case 5379:
conn_set_clienttag(conn,CLIENTTAG_REDALERT_UINT);
return 0;
case 7168: /* Tiberian Sun: Firestorm */
case 7170:
case 7171:
@ -392,17 +413,7 @@ static int handle_wol_line(t_connection * conn, char const * wolline)
if (handle_wol_con_command(conn, command, numparams, params, text)!=-1) {}
else if (conn_get_state(conn)!=conn_state_loggedin) {
char temp[MAX_IRC_MESSAGE_LEN+1];
/**
* NOTICE: DELETE because in WOL isnt used!
* if ((38+std::strlen(command)+16+1)<sizeof(temp)) {
* snprintf(temp, sizeof(temp), ":Unrecognized command \"%s\" (before login)", command);
* irc_send(conn,ERR_UNKNOWNCOMMAND,temp);
* } else {
* irc_send(conn,ERR_UNKNOWNCOMMAND,":Unrecognized command (before login)");
* }
*/
char temp[MAX_IRC_MESSAGE_LEN+1];
} else {
/* command is handled later */
unrecognized_before = 1;
@ -431,7 +442,6 @@ extern int handle_wol_welcome(t_connection * conn)
/* This function need rewrite */
irc_send_motd(conn);
message_send_text(conn,message_type_notice,NULL,"This is an experimental service.");
conn_set_state(conn,conn_state_bot_password);
if (connlist_find_connection_by_accountname(conn_get_loggeduser(conn))) {
@ -459,7 +469,7 @@ extern int handle_wol_packet(t_connection * conn, t_packet const * const packet)
eventlog(eventlog_level_error,__FUNCTION__,"got NULL packet");
return -1;
}
if (conn_get_class(conn) != conn_class_wol && conn_get_class(conn) != conn_class_wserv) {
if (conn_get_class(conn) != conn_class_wol && conn_get_class(conn) != conn_class_wserv && conn_get_class(conn) != conn_class_wgameres) {
eventlog(eventlog_level_error,__FUNCTION__,"FIXME: handle_wol_packet without any reason (conn->class != conn_class_wol && conn->class != conn_class_wserv)");
return -1;
}
@ -841,7 +851,7 @@ static int _handle_list_command(t_connection * conn, int numparams, char ** para
if((std::strstr(tempname,"Lob") != NULL) || (std::strstr(tempname,"Emperor") != NULL)) {
eventlog(eventlog_level_debug,__FUNCTION__,"[** WOL **] LIST [Channel: \"Lob\"] (%s)",tempname);
if (std::strlen(tempname)+1+20+1+1<MAX_IRC_MESSAGE_LEN)
snprintf(temp, sizeof(temp), "%s %u 0 388",tempname,channel_get_length(channel));
snprintf(temp, sizeof(temp), "%s %u 0 388:",tempname,channel_get_length(channel));
else
eventlog(eventlog_level_warn,__FUNCTION__,"LISTREPLY length exceeded");
irc_send(conn,RPL_CHANNEL,temp);
@ -866,7 +876,7 @@ static int _handle_list_command(t_connection * conn, int numparams, char ** para
(std::strcmp(params[0], "31") == 0) ||
(std::strcmp(params[0], "33") == 0) ||
(std::strcmp(params[0], "37") == 0) ||
(std::strcmp(params[0], "41"))) {
(std::strcmp(params[0], "41") == 0)) {
eventlog(eventlog_level_debug,__FUNCTION__,"[** WOL **] LIST [Game]");
LIST_TRAVERSE_CONST(channellist(),curr)
{
@ -876,35 +886,36 @@ static int _handle_list_command(t_connection * conn, int numparams, char ** para
char * topic = channel_get_topic(channel_get_name(channel));
tempname = irc_convert_channel(channel);
if((std::strstr(tempname,"_game") != NULL) || (std::strstr(tempname,"_Game") != NULL)) {
if((channel_wol_get_game_type(channel) != 0)) {
m = channel_get_first(channel);
if((channel_wol_get_game_type(channel) == conn_wol_get_game_type(conn)) || ((numparams == 0))) {
eventlog(eventlog_level_debug,__FUNCTION__,"[** WOL **] List [Channel: \"_game\"] (%s)",tempname);
eventlog(eventlog_level_debug,__FUNCTION__,"[** WOL **] List [Channel: \"_game\"] %s %u 0 %u %u 0 %u 128::",tempname,
eventlog(eventlog_level_debug,__FUNCTION__,"[** WOL **] List [Channel: \"_game\"] %s %u 0 %u %u %s %u 128::",tempname,
channel_get_length(channel),channel_wol_get_game_type(channel),channel_wol_get_game_tournament(channel),
channel_wol_get_game_ownerip(channel));
channel_wol_get_game_extension(channel),channel_wol_get_game_ownerip(channel));
if (topic) {
eventlog(eventlog_level_debug,__FUNCTION__,"[** WOL **] List [Channel: \"_game\"] %s %u 0 %u %u 0 %u 128::%s",tempname,
eventlog(eventlog_level_debug,__FUNCTION__,"[** WOL **] List [Channel: \"_game\"] %s %u 0 %u %u %s %u 128::%s",tempname,
channel_get_length(channel),channel_wol_get_game_type(channel),channel_wol_get_game_tournament(channel),
channel_wol_get_game_ownerip(channel),topic);
channel_wol_get_game_extension(channel),channel_wol_get_game_ownerip(channel),topic);
/**
* The layout of the game list entry is something like this:
*
* #game_channel_name users unknown gameType gameIsTournment unknown longIP 128::topic
* #game_channel_name users unknown gameType gameIsTournment gameExtension longIP 128::topic
*/
if (std::strlen(tempname)+1+20+1+1+std::strlen(topic)<MAX_IRC_MESSAGE_LEN)
snprintf(temp, sizeof(temp), "%s %u 0 %u %u 0 %u 128::%s",tempname,
snprintf(temp, sizeof(temp), "%s %u 0 %u %u %s %u 128::%s",tempname,
channel_get_length(channel),channel_wol_get_game_type(channel),channel_wol_get_game_tournament(channel),
channel_wol_get_game_ownerip(channel),topic);
channel_wol_get_game_extension(channel),channel_wol_get_game_ownerip(channel),topic);
else
eventlog(eventlog_level_warn,__FUNCTION__,"LISTREPLY length exceeded");
}
else {
if (std::strlen(tempname)+1+20+1+1<MAX_IRC_MESSAGE_LEN)
snprintf(temp, sizeof(temp), "%s %u 0 %u %u 0 %u 128::",tempname,channel_get_length(channel),channel_wol_get_game_type(channel),
channel_wol_get_game_tournament(channel),channel_wol_get_game_ownerip(channel));
snprintf(temp, sizeof(temp), "%s %u 0 %u %u %s %u 128::",tempname,channel_get_length(channel),channel_wol_get_game_type(channel),
channel_wol_get_game_tournament(channel),channel_wol_get_game_extension(channel),channel_wol_get_game_ownerip(channel));
else
eventlog(eventlog_level_warn,__FUNCTION__,"LISTREPLY length exceeded");
}
@ -1042,7 +1053,7 @@ static int _handle_quit_command(t_connection * conn, int numparams, char ** para
irc_send(conn,RPL_QUIT,":goodbye");
conn_set_channel(conn, NULL);
conn_set_state(conn, conn_state_destroy);
return 0;
}
@ -1051,7 +1062,6 @@ static int _handle_part_command(t_connection * conn, int numparams, char ** para
if ((conn_wol_get_ingame(conn) == 1)) {
conn_wol_set_ingame(conn,0);
}
message_send_text(conn,message_type_part,conn,NULL);
conn_set_channel(conn, NULL); /* In WOL we disconecting from the channel */
return 0;
@ -1156,16 +1166,16 @@ static int _handle_whereto_command(t_connection * conn, int numparams, char ** p
if (conn_get_clienttag(conn) == CLIENTTAG_RENEGADE_UINT) {
snprintf(temp, sizeof(temp), ":%s 0 'Ping server' %s %s %s", wolip, woltimezone, wollong, wollat);
irc_send(conn,RPL_PINGSERVER,temp);
//snprintf(temp, sizeof(temp), ":%s 4000 'Port Mangler' %s %s %s", wolip, woltimezone, wollong, wollat); //I dont know for what is this server...?
//snprintf(temp, sizeof(temp), ":%s 4321 'Port Mangler' %s %s %s", wolip, woltimezone, wollong, wollat); //I dont know for what is this server...?
//irc_send(conn,RPL_MANGLERSERV,temp);
}
/* This will be for anyone game */
snprintf(temp, sizeof(temp), ":%s %d 'Live chat server' %s %s %s", wolip, BNETD_WOL_PORT, woltimezone, wollong, wollat);
irc_send(conn,RPL_WOLSERV,temp);
snprintf(temp, sizeof(temp), ":%s %d 'Gameres server' %s %s %s", wolip, BNETD_WOL_PORT, woltimezone, wollong, wollat);
snprintf(temp, sizeof(temp), ":%s %d 'Gameres server' %s %s %s", wolip, BNETD_WGAMERES_PORT, woltimezone, wollong, wollat);
irc_send(conn,RPL_GAMERESSERV,temp);
snprintf(temp, sizeof(temp), ":%s %d 'Ladder server' %s %s %s", wolip, BNETD_WOL_PORT, woltimezone, wollong, wollat);
snprintf(temp, sizeof(temp), ":%s %d 'Ladder server' %s %s %s", wolip, BNETD_WGAMERES_PORT, woltimezone, wollong, wollat);
irc_send(conn,RPL_LADDERSERV,temp);
return 0;
@ -1195,11 +1205,11 @@ static int _handle_squadinfo_command(t_connection * conn, int numparams, char **
std::memset(_temp,0,sizeof(_temp));
/* FIXME: Not completed! */
/* FIXME: Not completed! Here we will send info about BATLLECLANS */
if ((numparams=1)) {
snprintf(_temp, sizeof(_temp), "ID does not exist");
irc_send(conn,RPL_IDNOEXIST,_temp);
irc_send(conn,ERR_IDNOEXIST,_temp);
}
return 0;
}
@ -1215,6 +1225,18 @@ static int _handle_setopt_command(t_connection * conn, int numparams, char ** pa
* First parameter: 16 == FindDisabled 17 == FindEnabled
* Second parameter: 32 == PageDisabled 33 == PageEnabled
*/
char ** elems;
elems = irc_get_listelems(params[0]);
if ((elems)&&(elems[0])&&(elems[1])) {
conn_wol_set_findme(conn,std::atoi(elems[0]));
conn_wol_set_pageme(conn,std::atoi(elems[1]));
}
if (elems)
irc_unget_listelems(elems);
return 0;
}
@ -1306,11 +1328,10 @@ static int _handle_getlocale_command(t_connection * conn, int numparams, char **
static int _handle_getinsider_command(t_connection * conn, int numparams, char ** params, char * text)
{
char temp[MAX_IRC_MESSAGE_LEN];
// Ignore command but, return pramas[1]
/* Ignore command but, return pramas[1] */
eventlog(eventlog_level_debug,__FUNCTION__,"[** WOL **] GETINSIDER %s",params[1]);
irc_send(conn,RPL_GET_INSIDER,params[1]);
return 0;
}
@ -1330,11 +1351,11 @@ static int _handle_joingame_command(t_connection * conn, int numparams, char **
* JOINGAME [#Game_channel] 2 [NumberOfPlayers] [gameType] 1 1 [gameIsTournament]
* Knowed GameTypes (0-chat, 1-cnc, 2-ra1, 3-racs, 4-raam, 5-solsurv)
*
* Here is the input expected for WOL:
* JOINGAME #user's_game unknown numberOfPlayers gameType unknown unknown gameIsTournament unknown password
* Here is the input expected:
* JOINGAME #user's_game MinOfPlayers MaxOfPlayers gameType unknown unknown gameIsTournament gameExtension password
*
* Heres the output expected:
* user!WWOL@hostname JOINGAME unknown numberOfPlayers gameType unknown clanID longIP gameIsTournament :#game_channel_name
* user!WWOL@hostname JOINGAME MinOfPlayers MaxOfPlayers gameType unknown clanID longIP gameIsTournament :#game_channel_name
*/
if((numparams==2)) {
char ** e;
@ -1348,10 +1369,28 @@ static int _handle_joingame_command(t_connection * conn, int numparams, char **
char * old_channel_name = NULL;
char temp[MAX_IRC_MESSAGE_LEN];
char * topic;
t_channel * channel;
t_channel * old_channel = conn_get_channel(conn);
conn_wol_set_ingame(conn,1);
channel = channellist_find_channel_by_name(wolname,NULL,NULL);
if (channel == NULL) {
irc_send(conn,ERR_NOSUCHCHANNEL,":No such channel");
if (e)
irc_unget_listelems(e);
return 0;
}
if (channel_get_length(channel) == channel_get_max(channel)) {
snprintf(temp, sizeof(temp), "%s :Channel is full",e[0]);
irc_send(conn,ERR_CHANNELISFULL,temp);
if (e)
irc_unget_listelems(e);
return 0;
}
conn_wol_set_ingame(conn,1);
if (old_channel)
old_channel_name = xstrdup(irc_convert_channel(old_channel));
@ -1360,7 +1399,6 @@ static int _handle_joingame_command(t_connection * conn, int numparams, char **
conn_wol_set_ingame(conn,0);
}
else {
t_channel * channel;
char const * gameOptions;
channel = conn_get_channel(conn);
@ -1408,6 +1446,7 @@ static int _handle_joingame_command(t_connection * conn, int numparams, char **
}
else if((numparams>=7)) {
char ** e;
int i;
eventlog(eventlog_level_debug,__FUNCTION__,"[** WOL **] JOINGAME: * Create * (%s, %s)",
params[0],params[1]);
@ -1453,8 +1492,10 @@ static int _handle_joingame_command(t_connection * conn, int numparams, char **
channel_wol_set_game_owner(channel,conn_get_chatname(conn));
channel_wol_set_game_ownerip(channel,conn_get_addr(conn));
/* HACK: Currently, this is the best way to set the channel game type... */
channel_set_max(channel,std::atoi(params[2]));
channel_wol_set_game_type(channel,std::atoi(params[3]));
channel_wol_set_game_tournament(channel,std::atoi(params[6]));
channel_wol_set_game_extension(channel,params[7]);
message_send_text(conn,message_wol_joingame,conn,_temp); /* we have to send the JOINGAME acknowledgement */
wolname=irc_convert_channel(channel);
@ -1552,6 +1593,8 @@ static int _handle_gameopt_command(t_connection * conn, int numparams, char ** p
}
}
}
if (e)
irc_unget_listelems(e);
}
else
irc_send(conn,ERR_NEEDMOREPARAMS,":Too few arguments to GAMEOPT");
@ -1568,12 +1611,12 @@ static int _handle_finduser_command(t_connection * conn, int numparams, char **
if ((numparams>=1)) {
t_connection * user;
if((user = connlist_find_connection_by_accountname(params[0]))) {
if((user = connlist_find_connection_by_accountname(params[0]))&&(conn_wol_get_findme(user) == 17)) {
wolname = irc_convert_channel(conn_get_channel(user));
snprintf(_temp, sizeof(_temp), "0 :%s", wolname); /* User found in channel wolname */
}
else
snprintf(_temp, sizeof(_temp), "1 :"); /* user not loged or have disabled find */
snprintf(_temp, sizeof(_temp), "1 :"); /* user not loged or have not allowed find */
irc_send(conn,RPL_FIND_USER,_temp);
}
@ -1590,12 +1633,12 @@ static int _handle_finduserex_command(t_connection * conn, int numparams, char *
if ((numparams>=1)) {
t_connection * user;
if((user = connlist_find_connection_by_accountname(params[0]))) {
if((user = connlist_find_connection_by_accountname(params[0]))&&(conn_wol_get_findme(user) == 17)) {
wolname = irc_convert_channel(conn_get_channel(user));
snprintf(_temp, sizeof(_temp), "0 :%s,0", wolname); /* User found in channel wolname */
}
else
snprintf(_temp, sizeof(_temp), "1 :"); /* user not loged or have disabled find */
snprintf(_temp, sizeof(_temp), "1 :"); /* user not loged or have not allowed find */
irc_send(conn,RPL_FIND_USER_EX,_temp);
}
@ -1612,12 +1655,12 @@ static int _handle_page_command(t_connection * conn, int numparams, char ** para
t_connection * user;
snprintf(_temp, sizeof(_temp), ":%s", text);
if((user = connlist_find_connection_by_accountname(params[0]))) {
if((user = connlist_find_connection_by_accountname(params[0]))&&(conn_wol_get_pageme(user) == 33)) {
message_send_text(user,message_wol_page,conn,_temp);
snprintf(_temp, sizeof(_temp), "0 :"); /* Page was succesfull */
}
else
snprintf(_temp, sizeof(_temp), "1 :"); /* User not loged in or have disabled page */
snprintf(_temp, sizeof(_temp), "1 :"); /* User not loged in or have not allowed page */
irc_send(conn,RPL_PAGE,_temp);
}
return 0;
@ -1627,8 +1670,8 @@ static int _handle_startg_command(t_connection * conn, int numparams, char ** pa
{
char temp[MAX_IRC_MESSAGE_LEN];
char _temp_a[MAX_IRC_MESSAGE_LEN];
char time_temp[100];
t_channel * channel;
int numelems = 0;
std::time_t now;
@ -1637,11 +1680,12 @@ static int _handle_startg_command(t_connection * conn, int numparams, char ** pa
* (we are assuming for this example that user1 is the game owner)
*
* WOLv1:
* :user1!WWOL@hostname STARTG u :owner_ip gameNumber time_t
* :user1!WWOL@hostname STARTG u :owner_ip :gameNumber time_t
*
* WOLv2:
* user1!WWOL@hostname STARTG u :user1 xxx.xxx.xxx.xxx user2 xxx.xxx.xxx.xxx :gameNumber time_t
*/
if((numparams>=1)) {
int i;
char ** e;
@ -1652,33 +1696,34 @@ static int _handle_startg_command(t_connection * conn, int numparams, char ** pa
e = irc_get_listelems(params[1]);
/* FIXME: support wildcards! */
std::strcat(temp,":");
if (conn_get_clienttag(conn) == CLIENTTAG_WCHAT_UINT) {
if (e) {
for (numelems=0;e[numelems];numelems++);
}
std::strcat(temp,":");
if (numelems == 1) {
t_connection * user;
channel = conn_get_channel(conn);
for (user = channel_get_first(channel);user;user = channel_get_next()) {
char const * name = conn_get_chatname(user);
if (std::strcmp(conn_get_chatname(conn),name) != 0) {
now = std::time(NULL);
snprintf(temp, sizeof(temp), ":%s 1234 %u", addr_num_to_ip_str(channel_wol_get_game_ownerip(channel)),now);
message_send_text(user,message_wol_start_game,conn,temp);
snprintf(temp, sizeof(temp), "%s ", addr_num_to_ip_str(channel_wol_get_game_ownerip(channel)));
}
}
return 0;
}
else if (numelems>=2) {
for (i=0;((e)&&(e[i]));i++) {
t_connection * user;
const char * addr = NULL;
for (i=0;((e)&&(e[i]));i++) {
t_connection * user;
const char * addr = NULL;
if((user = connlist_find_connection_by_accountname(e[i]))) {
addr = addr_num_to_ip_str(conn_get_addr(user));
}
snprintf(_temp_a, sizeof(_temp_a), "%s %s ", e[i], addr);
std::strcat(temp,_temp_a);
if((user = connlist_find_connection_by_accountname(e[i]))) {
addr = addr_num_to_ip_str(conn_get_addr(user));
}
snprintf(_temp_a, sizeof(_temp_a), "%s %s ", e[i], addr);
std::strcat(temp,_temp_a);
}
}
std::strcat(temp,":");
@ -1686,25 +1731,27 @@ static int _handle_startg_command(t_connection * conn, int numparams, char ** pa
std::strcat(temp," ");
now = std::time(NULL);
snprintf(time_temp, sizeof(time_temp), "%u", now);
std::strcat(temp,time_temp);
snprintf(_temp_a, sizeof(_temp_a), "%u", now);
std::strcat(temp,_temp_a);
eventlog(eventlog_level_debug,__FUNCTION__,"[** WOL **] STARTG: (%s)",temp);
for (i=0;((e)&&(e[i]));i++) {
t_connection * user;
if((user = connlist_find_connection_by_accountname(e[i]))) {
message_send_text(user,message_wol_start_game,conn,temp);
}
}
if ((channel = channellist_find_channel_by_name(irc_convert_ircname(params[0]),NULL,NULL))) {
channel_message_send(channel,message_wol_start_game,conn,temp);
}
else {
irc_send(conn,ERR_NOSUCHCHANNEL,":No such channel");
}
if (e)
irc_unget_listelems(e);
}
return 0;
}
static int _handle_listsearch_command(t_connection * conn, int numparams, char ** params, char * text)
{
// FIXME: Not implemented
// THAT IS LADDER SERVER COMMAND!!!!
return 0;
}
@ -1736,7 +1783,7 @@ static int _handle_chanchk_command(t_connection * conn, int numparams, char ** p
{
char temp[MAX_IRC_MESSAGE_LEN];
t_channel * channel;
std::memset(temp,0,sizeof(temp));
/**
@ -1746,18 +1793,252 @@ static int _handle_chanchk_command(t_connection * conn, int numparams, char ** p
* Heres the output expected
* :[servername] CHANCHK [channel]
*/
if ((channel = channellist_find_channel_by_name(irc_convert_ircname(params[0]),NULL,NULL))) {
std::strcat(temp,params[0]);
message_send_text(conn,message_wol_chanchk,conn,temp);
}
else {
irc_send(conn,ERR_NOSUCHCHANNEL,":No such channel");
}
std::strcat(temp,params[0]);
message_send_text(conn,message_wol_chanchk,conn,temp);
}
else {
irc_send(conn,ERR_NOSUCHCHANNEL,":No such channel");
}
return 0;
}
static int _handle_getbuddy_command(t_connection * conn, int numparams, char ** params, char * text)
{
char temp[MAX_IRC_MESSAGE_LEN];
char _temp[MAX_IRC_MESSAGE_LEN];
char const * friend_name;
t_account * my_acc;
t_account * friend_acc;
t_list * flist;
t_friend * fr;
int num;
unsigned int uid;
int i;
std::memset(temp,0,sizeof(temp));
std::memset(_temp,0,sizeof(_temp));
/**
* Heres the output expected
* :[servername] 333 [user] [buddy_name1]`[buddy_name2]`
*
* Without names:
* :[servername] 333 [user]
*/
my_acc = conn_get_account(conn);
num = account_get_friendcount(my_acc);
flist=account_get_friends(my_acc);
if(flist!=NULL) {
for (i=0; i<num; i++) {
if ((!(uid = account_get_friend(my_acc,i))) || (!(fr = friendlist_find_uid(flist,uid))))
{
eventlog(eventlog_level_error,__FUNCTION__,"friend uid in list");
continue;
}
friend_acc = friend_get_account(fr);
friend_name = account_get_name(friend_acc);
snprintf(_temp, sizeof(_temp), "%s`", friend_name);
std::strcat(temp,_temp);
}
}
eventlog(eventlog_level_debug,__FUNCTION__,"[** WOL **] GETBUDDY (%s)",temp);
irc_send(conn,RPL_GET_BUDDY,temp);
return 0;
}
static int _handle_addbuddy_command(t_connection * conn, int numparams, char ** params, char * text)
{
char temp[MAX_IRC_MESSAGE_LEN];
char const * friend_name;
t_account * my_acc;
t_account * friend_acc;
int num;
std::memset(temp,0,sizeof(temp));
/**
* Heres the imput expected
* ADDBUDDY [buddy_name]
*
* Heres the output expected
* :[servername] 334 [user] [buddy_name]
*/
friend_name = params[0];
my_acc = conn_get_account(conn);
friend_acc = accountlist_find_account(friend_name);
account_add_friend(my_acc, friend_acc);
/* FIXME: Check if add friend is done if not then send right message */
snprintf(temp,sizeof(temp),"%s", friend_name);
irc_send(conn,RPL_ADD_BUDDY,temp);
return 0;
}
static int _handle_delbuddy_command(t_connection * conn, int numparams, char ** params, char * text)
{
char temp[MAX_IRC_MESSAGE_LEN];
char const * friend_name;
t_account * my_acc;
int num;
std::memset(temp,0,sizeof(temp));
/**
* Heres the imput expected
* DELBUDDY [buddy_name]
*
* Heres the output expected
* :[servername] 335 [user] [buddy_name]
*/
friend_name = params[0];
my_acc = conn_get_account(conn);
num = account_remove_friend2(my_acc, friend_name);
/**
* FIXME: Check if remove friend is done if not then send right message
* Btw I dont know another then RPL_DEL_BUDDY message yet lol.
*/
snprintf(temp,sizeof(temp),"%s", friend_name);
irc_send(conn,RPL_DEL_BUDDY,temp);
return 0;
}
static int _handle_time_command(t_connection * conn, int numparams, char ** params, char * text)
{
char temp[MAX_IRC_MESSAGE_LEN];
std::time_t now;
std::memset(temp,0,sizeof(temp));
now = std::time(NULL);
snprintf(temp,sizeof(temp),"irc.westwood.com :%u", now);
irc_send(conn,RPL_TIME,temp);
return 0;
}
static int _handle_kick_command(t_connection * conn, int numparams, char ** params, char * text)
{
char temp[MAX_IRC_MESSAGE_LEN];
t_channel * channel;
t_connection * c;
unsigned int flags;
/**
* Heres the imput expected
* KICK [channel] [kicked_user]
*
* Heres the output expected
* :user!WWOL@hostname KICK [channel] [kicked_user] :[user_op]
*/
flags = conn_get_flags(conn);
if (!flags & MF_BLIZZARD) {
snprintf(temp,sizeof(temp),"That command is for Admins/Operators only.");
message_send_text(conn,message_type_whisper,conn,temp);
return 0;
}
if (params[1])
c = connlist_find_connection_by_name(params[1],NULL);
if ((channel = channellist_find_channel_by_name(irc_convert_ircname(params[0]),NULL,NULL))) {
snprintf(temp, sizeof(temp), "%s %s :%s", params[0], params[1], conn_get_loggeduser(conn));
channel_message_send(channel,message_wol_kick,conn,temp);
if ((conn_wol_get_ingame(c) == 1)) {
conn_wol_set_ingame(c,0);
}
conn_set_channel(c, NULL);
}
else {
irc_send(conn,ERR_NOSUCHCHANNEL,":No such channel");
}
return 0;
}
static int _handle_mode_command(t_connection * conn, int numparams, char ** params, char * text)
{
char temp[MAX_IRC_MESSAGE_LEN];
std::memset(temp,0,sizeof(temp));
t_channel * channel;
/**
* FIXME: CHECK IF USER IS OPERATOR
* because in WOLv1 is used mode command to add OP or Voice to another user !!!!
* in WOLv2 is used for change game mode (cooperative, free for all...)
*/
if ((channel = channellist_find_channel_by_name(irc_convert_ircname(params[0]),NULL,NULL))) {
snprintf(temp,sizeof(temp),"%s %s %s", params[0], params[1], params[2]);
channel_message_send(channel,message_type_mode,conn,temp);
}
else {
irc_send(conn,ERR_NOSUCHCHANNEL,":No such channel");
}
return 0;
}
static int _handle_host_command(t_connection * conn, int numparams, char ** params, char * text)
{
char temp[MAX_IRC_MESSAGE_LEN];
t_connection * user;
std::memset(temp,0,sizeof(temp));
if ((user = connlist_find_connection_by_accountname(params[0]))) {
snprintf(temp,sizeof(temp),"I am hosting at %s", text);
message_send_text(user,message_type_whisper,conn,temp);
}
else {
irc_send(conn,ERR_NOSUCHNICK,":No such user");
}
return 0;
}
static int _handle_advertc_command(t_connection * conn, int numparams, char ** params, char * text)
{
/* FIXME: Not implemented yet */
return 0;
}
static int _handle_clanbyname_command(t_connection * conn, int numparams, char ** params, char * text)
{
/* FIXME: Not implemented yet */
return 0;
}
static int _handle_userip_command(t_connection * conn, int numparams, char ** params, char * text)
{
char temp[MAX_IRC_MESSAGE_LEN];
t_connection * user;
const char * addr = NULL;
std::memset(temp,0,sizeof(temp));
if((user = connlist_find_connection_by_accountname(params[0]))) {
addr = addr_num_to_ip_str(conn_get_addr(user));
snprintf(temp,sizeof(temp),"%s",addr);
message_send_text(conn,message_wol_userip,conn,temp);
}
else {
irc_send(conn,ERR_NOSUCHNICK,":No such user");
}
return 0;
}
}
}

70
pvpgn/src/bnetd/irc.cpp
View file

@ -143,8 +143,8 @@ extern int irc_send_ping(t_connection * conn)
return -1;
}
if ((conn_get_clienttag(conn) != CLIENTTAG_WCHAT_UINT) &&
(conn_get_clienttag(conn) != CLIENTTAG_IIRC_UINT))
if ((conn_get_clienttag(conn) != CLIENTTAG_WCHAT_UINT) &&
(conn_get_clienttag(conn) != CLIENTTAG_IIRC_UINT))
return 0;
if (!(p = packet_create(packet_class_raw))) {
@ -495,23 +495,24 @@ static char * irc_message_preformat(t_irc_message_from const * from, char const
char * msg;
if (!command) {
eventlog(eventlog_level_error,__FUNCTION__,"got NULL command");
return NULL;
eventlog(eventlog_level_error,__FUNCTION__,"got NULL command");
return NULL;
}
if (from) {
if ((!from->nick)||(!from->user)||(!from->host)) {
eventlog(eventlog_level_error,__FUNCTION__,"got malformed from");
return NULL;
}
myfrom = (char*)xmalloc(std::strlen(from->nick)+1+std::strlen(from->user)+1+std::strlen(from->host)+1); /* nick + "!" + user + "@" + host + "\0" */
std::sprintf(myfrom,"%s!%s@%s",from->nick,from->user,from->host);
if ((!from->nick)||(!from->user)||(!from->host)) {
eventlog(eventlog_level_error,__FUNCTION__,"got malformed from");
return NULL;
}
myfrom = (char*)xmalloc(std::strlen(from->nick)+1+std::strlen(from->user)+1+std::strlen(from->host)+1); /* nick + "!" + user + "@" + host + "\0" */
std::sprintf(myfrom,"%s!%s@%s",from->nick,from->user,from->host);
} else
myfrom = xstrdup(server_get_hostname());
if (dest)
mydest = dest;
if (text)
mytext = text;
len = 1+std::strlen(myfrom)+1+
std::strlen(command)+1+
std::strlen(mydest)+1+
@ -519,6 +520,7 @@ static char * irc_message_preformat(t_irc_message_from const * from, char const
msg = (char*)xmalloc(len);
std::sprintf(msg,":%s\n%s\n%s\n%s",myfrom,command,mydest,mytext);
xfree(myfrom);
return msg;
@ -534,6 +536,7 @@ extern int irc_message_postformat(t_packet * packet, t_connection const * dest)
char * e4;
char const * tname = NULL;
char const * toname = "AUTH"; /* fallback name */
char * temp;
if (!packet) {
eventlog(eventlog_level_error,__FUNCTION__,"got NULL packet");
@ -582,16 +585,18 @@ extern int irc_message_postformat(t_packet * packet, t_connection const * dest)
toname = e3;
if (std::strcmp(toname,"\r")==0) {
toname = ""; /* HACK: the target field is really empty */
}
toname = ""; /* HACK: the target field is really empty */
temp = "";
} else
temp = " ";
if (std::strlen(e1)+1+std::strlen(e2)+1+std::strlen(toname)+1+std::strlen(e4)+2+1 <= MAX_IRC_MESSAGE_LEN) {
if (std::strlen(e1)+1+std::strlen(e2)+1+std::strlen(toname)+std::strlen(temp)+std::strlen(e4)+2+1 <= MAX_IRC_MESSAGE_LEN) {
char msg[MAX_IRC_MESSAGE_LEN+1];
if (e1_2)
std::sprintf(msg,"%s@hidden %s %s %s\r\n",e1,e2,toname,e4);
std::sprintf(msg,"%s@hidden %s %s%s%s\r\n",e1,e2,toname,temp,e4);
else
std::sprintf(msg,"%s %s %s %s\r\n",e1,e2,toname,e4);
std::sprintf(msg,"%s %s %s%s%s\r\n",e1,e2,toname,temp,e4);
eventlog(eventlog_level_debug,__FUNCTION__,"sent \"%s\"",msg);
packet_set_size(packet,0);
packet_append_data(packet,msg,std::strlen(msg));
@ -813,22 +818,29 @@ extern int irc_message_format(t_packet * packet, t_message_type type, t_connecti
from.nick = conn_get_chatname(me);
from.user = ctag;
from.host = addr_num_to_ip_str(conn_get_addr(me));
msg = irc_message_preformat(&from,"PAGE","",text);
msg = irc_message_preformat(&from,"PAGE",NULL,text);
conn_unget_chatname(me,from.nick);
break;
case message_wol_advertr:
from.nick = conn_get_chatname(me);
from.user = ctag;
from.host = addr_num_to_ip_str(conn_get_addr(me));
msg = irc_message_preformat(&from,"ADVERTR","\r",text);
conn_unget_chatname(me,from.nick);
msg = irc_message_preformat(NULL,"ADVERTR","\r",text);
break;
case message_wol_chanchk:
msg = irc_message_preformat(NULL,"CHANCHK","\r",text);
break;
case message_wol_kick:
from.nick = conn_get_chatname(me);
from.user = ctag;
from.host = addr_num_to_ip_str(conn_get_addr(me));
msg = irc_message_preformat(&from,"CHANCHK","\r",text);
msg = irc_message_preformat(&from,"KICK","\r",text);
conn_unget_chatname(me,from.nick);
break;
break;
case message_wol_userip:
from.nick = conn_get_chatname(me);
from.user = ctag;
from.host = addr_num_to_ip_str(conn_get_addr(me));
msg = irc_message_preformat(&from,"USERIP","\r",text);
conn_unget_chatname(me,from.nick);
break;
default:
eventlog(eventlog_level_warn,__FUNCTION__,"%d not yet implemented",type);
return -1;
@ -890,8 +902,12 @@ extern int irc_send_rpl_namreply(t_connection * c, t_channel const * channel)
if((conn_get_wol(c) == 1)) {
if ((channel_wol_get_game_owner(channel) != NULL) && (std::strcmp(channel_wol_get_game_owner(channel),name) == 0)) {
std::strcat(temp,"@");
std::strcat(temp,"@");
}
else if ((conn_wol_get_ingame(c) == 0)) {
if (flags & MF_BLIZZARD)
std::strcat(temp,"@");
}
if (conn_get_clienttag(c) != CLIENTTAG_WCHAT_UINT) {
std::sprintf(temp,"%s%s,0,%u",temp,name,conn_get_addr(m));
}
@ -901,8 +917,8 @@ extern int irc_send_rpl_namreply(t_connection * c, t_channel const * channel)
}
else
{
std::strcat(temp,flg);
std::strcat(temp,name);
std::strcat(temp,flg);
std::strcat(temp,name);
}
first = 0;

5
pvpgn/src/bnetd/message.cpp
View file

@ -1400,6 +1400,7 @@ static t_packet * message_cache_lookup(t_message * message, t_connection *dst, u
case conn_class_irc:
case conn_class_wol:
case conn_class_wserv:
case conn_class_wgameres:
if (!(packet = packet_create(packet_class_raw)))
{
eventlog(eventlog_level_error,__FUNCTION__,"could not create packet");
@ -1468,7 +1469,7 @@ extern int message_send(t_message * message, t_connection * dst)
return -1;
/* FIXME: this is not needed now, message has dst */
if ((conn_get_class(dst)==conn_class_irc)||(conn_get_class(dst)==conn_class_wol)||(conn_get_class(dst)==conn_class_wserv)) {
if ((conn_get_class(dst)==conn_class_irc)||(conn_get_class(dst)==conn_class_wol)||(conn_get_class(dst)==conn_class_wserv)||(conn_get_class(dst)==conn_class_wgameres)) {
/* HACK: IRC message always need the recipient and are therefore bad to cache. */
/* So we only cache a pseudo packet and convert it to a real packet later ... */
packet = packet_duplicate(packet); /* we want to modify packet so we have to create a copy ... */
@ -1480,7 +1481,7 @@ extern int message_send(t_message * message, t_connection * dst)
conn_push_outqueue(dst,packet);
if ((conn_get_class(dst)==conn_class_irc)||(conn_get_class(dst)==conn_class_wol)||(conn_get_class(dst)==conn_class_wserv))
if ((conn_get_class(dst)==conn_class_irc)||(conn_get_class(dst)==conn_class_wol)||(conn_get_class(dst)==conn_class_wserv)||(conn_get_class(dst)==conn_class_wgameres))
packet_del_ref(packet); /* we don't need the previously created copy anymore ... */
return 0;

2
pvpgn/src/bnetd/message.h
View file

@ -75,6 +75,8 @@ typedef enum
message_wol_page,
message_wol_advertr,
message_wol_chanchk,
message_wol_kick,
message_wol_userip,
message_type_null
} t_message_type;

26
pvpgn/src/bnetd/prefs.cpp
View file

@ -161,6 +161,7 @@ static struct {
char const * woladdrs;
char const * wservaddrs;
char const * wgameresaddrs;
char const * woltimezone;
char const * wollongitude;
char const * wollatitude;
@ -634,6 +635,9 @@ static int conf_setdef_irc_network_name(void);
static int conf_set_irc_network_name(const char *valstr);
static const char *conf_get_irc_network_name(void);
static int conf_setdef_wgameres_addrs(void);
static int conf_set_wgameres_addrs(const char *valstr);
static const char *conf_get_wgameres_addrs(void);
static int conf_setdef_wserv_addrs(void);
static int conf_set_wserv_addrs(const char *valstr);
@ -776,6 +780,7 @@ static t_conf_entry conf_table[] =
{ "ladder_prefix", conf_set_ladder_prefix, conf_get_ladder_prefix,conf_setdef_ladder_prefix},
{ "irc_network_name", conf_set_irc_network_name, conf_get_irc_network_name, conf_setdef_irc_network_name},
{ "wgameresaddrs", conf_set_wgameres_addrs, conf_get_wgameres_addrs, conf_setdef_wgameres_addrs},
{ "wservaddrs", conf_set_wserv_addrs, conf_get_wserv_addrs, conf_setdef_wserv_addrs},
{ "woladdrs", conf_set_wol_addrs, conf_get_wol_addrs, conf_setdef_wol_addrs},
{ "woltimezone", conf_set_wol_timezone, conf_get_wol_timezone, conf_setdef_wol_timezone},
@ -3321,6 +3326,26 @@ static const char* conf_get_irc_network_name(void)
/**
* Westwood Online Extensions
*/
extern char const * prefs_get_wgameres_addrs(void)
{
return prefs_runtime_config.wgameresaddrs;
}
static int conf_set_wgameres_addrs(const char *valstr)
{
return conf_set_str(&prefs_runtime_config.wgameresaddrs,valstr,NULL);
}
static int conf_setdef_wgameres_addrs(void)
{
return conf_set_str(&prefs_runtime_config.wgameresaddrs,NULL,BNETD_WOL_ADDRS);
}
static const char* conf_get_wgameres_addrs(void)
{
return prefs_runtime_config.wgameresaddrs;
}
extern char const * prefs_get_wserv_addrs(void)
{
return prefs_runtime_config.wservaddrs;
@ -3361,7 +3386,6 @@ static const char* conf_get_wol_addrs(void)
return prefs_runtime_config.woladdrs;
}
static int conf_set_wol_timezone(const char *valstr)
{
return conf_set_str(&prefs_runtime_config.woltimezone,valstr,NULL);

1
pvpgn/src/bnetd/prefs.h
View file

@ -181,6 +181,7 @@ extern char const * prefs_get_irc_network_name(void);
/**
* Westwood Online Extensions
*/
extern char const * prefs_get_wgameres_addrs(void);
extern char const * prefs_get_wserv_addrs(void);
extern char const * prefs_get_wol_addrs(void);
extern char const * prefs_get_wol_timezone(void);

16
pvpgn/src/bnetd/server.cpp
View file

@ -204,6 +204,8 @@ static char const * laddr_type_get_str(t_laddr_type laddr_type)
return "wol";
case laddr_type_wserv:
return "wserv";
case laddr_type_wgameres:
return "wgameres";
case laddr_type_telnet:
return "telnet";
default:
@ -350,6 +352,10 @@ static int sd_accept(t_addr const * curr_laddr, t_laddr_info const * laddr_info,
conn_set_class(c,conn_class_wserv);
conn_set_state(c,conn_state_connected);
break;
case laddr_type_wgameres:
conn_set_class(c,conn_class_wgameres);
conn_set_state(c,conn_state_connected);
break;
case laddr_type_w3route:
conn_set_class(c,conn_class_w3route);
conn_set_state(c,conn_state_connected);
@ -522,6 +528,7 @@ static int sd_tcpinput(t_connection * c)
case conn_class_irc:
case conn_class_wol:
case conn_class_wserv:
case conn_class_wgameres:
case conn_class_telnet:
if (!(packet = packet_create(packet_class_raw)))
{
@ -636,6 +643,7 @@ static int sd_tcpinput(t_connection * c)
case conn_class_irc:
ret = handle_irc_packet(c,packet);
break;
case conn_class_wgameres:
case conn_class_wserv:
case conn_class_wol:
ret = handle_wol_packet(c,packet);
@ -1461,6 +1469,14 @@ extern int server_process(void)
_shutdown_addrs(laddrs);
return -1;
}
/* Append list of addresses to listen for WGAMERES connections */
if (_setup_add_addrs(&laddrs, prefs_get_wgameres_addrs(),INADDR_ANY,BNETD_WGAMERES_PORT, laddr_type_wgameres))
{
eventlog(eventlog_level_error,__FUNCTION__,"could not create %s server address list from \"%s\"",laddr_type_get_str(laddr_type_wgameres),prefs_get_wgameres_addrs());
_shutdown_addrs(laddrs);
return -1;
}
/* Append list of addresses to listen for W3ROUTE connections */
if (_setup_add_addrs(&laddrs,prefs_get_w3route_addr(),INADDR_ANY,BNETD_W3ROUTE_PORT, laddr_type_w3route))

3
pvpgn/src/bnetd/server.h
View file

@ -35,7 +35,8 @@ typedef enum
laddr_type_w3route, /* warcraft 3 playgame routing (def. port 6200) */
laddr_type_irc, /* Internet Relay Chat service (port is varying; mostly on port 6667 or 7000) */
laddr_type_wol, /* Westwood Online (IRC) Chat Services (port is 4000) */
laddr_type_wserv, /* Westwood Server (IRC) Services (port is 4005) */
laddr_type_wserv, /* Westwood servserv (IRC) Services (port is 4005) */
laddr_type_wgameres,/* Westwood gameres Services (port is 4807) */
laddr_type_telnet /* telnet service (usually on port 23) */
} t_laddr_type;

4
pvpgn/src/common/irc_protocol.h
View file

@ -336,6 +336,8 @@
#define RPL_SET_CODEPAGE 329
#define RPL_GET_BUDDY 333
#define RPL_ADD_BUDDY 334
#define RPL_DEL_BUDDY 335
#define RPL_BATTLECLAN 358
@ -360,7 +362,7 @@
#define RPL_PINGSERVER 615
#define RPL_IDNOEXIST 439
#define ERR_IDNOEXIST 439
/** error's */
/*

2
pvpgn/src/common/setup_before.h
View file

@ -184,6 +184,8 @@ const char * const BNETD_WOL_ADDRS = "";
const int BNETD_WOL_PORT = 4000;
const char * const BNETD_WSERV_ADDRS = "";
const int BNETD_WSERV_PORT = 4005;
const char * const BNETD_WGAMERES_ADDRS = "";
const int BNETD_WGAMERES_PORT = 4807;
const char * const BNETD_TRACK_ADDRS = "track.pvpgn.org";
const int BNETD_TRACK_PORT = 6114; /* use this port if not specified */
const int BNETD_DEF_TEST_PORT = 6112; /* default guess for UDP test port */

11
pvpgn/src/common/tag.cpp
View file

@ -77,8 +77,10 @@ extern char const * clienttag_uint_to_str(t_clienttag clienttag)
return CLIENTTAG_WCHAT;
case CLIENTTAG_TIBERNSUN_UINT:
return CLIENTTAG_TIBERNSUN;
case CLIENTTAG_TIBSUNXP_UINT:
case CLIENTTAG_TIBSUNXP_UINT:
return CLIENTTAG_TIBSUNXP;
case CLIENTTAG_REDALERT_UINT:
return CLIENTTAG_REDALERT;
case CLIENTTAG_REDALERT2_UINT:
return CLIENTTAG_REDALERT2;
case CLIENTTAG_DUNE2000_UINT:
@ -96,12 +98,12 @@ extern char const * clienttag_uint_to_str(t_clienttag clienttag)
case CLIENTTAG_WWOL_UINT:
return CLIENTTAG_WWOL;
default:
return CLIENTTAG_UNKNOWN;
return CLIENTTAG_UNKNOWN;
}
}
/*****/
/* make all letters in string upper case - used in command.c*/
/* make all letters in string upper case - used in command.cpp*/
extern t_tag tag_case_str_to_uint(char const * tag_str)
{
unsigned int i, len;
@ -207,6 +209,7 @@ extern int tag_check_client(t_tag tag_uint)
case CLIENTTAG_WCHAT_UINT:
case CLIENTTAG_TIBERNSUN_UINT:
case CLIENTTAG_TIBSUNXP_UINT:
case CLIENTTAG_REDALERT_UINT:
case CLIENTTAG_REDALERT2_UINT:
case CLIENTTAG_DUNE2000_UINT:
case CLIENTTAG_NOX_UINT:
@ -279,6 +282,8 @@ extern char const * clienttag_get_title(t_clienttag clienttag)
return "Tiberian Sun";
case CLIENTTAG_TIBSUNXP_UINT:
return "Tiberian Sun: Firestorm";
case CLIENTTAG_REDALERT_UINT:
return "Red Alert";
case CLIENTTAG_REDALERT2_UINT:
return "Red Alert 2";
case CLIENTTAG_DUNE2000_UINT:

2
pvpgn/src/common/tag.h
View file

@ -87,6 +87,8 @@ typedef t_tag t_gamelang;
#define CLIENTTAG_TIBERNSUN_UINT 0x5453554E
#define CLIENTTAG_TIBSUNXP "TSXP" /* Tiberian Sun Extension Pack */
#define CLIENTTAG_TIBSUNXP_UINT 0x54535850
#define CLIENTTAG_REDALERT "RALT" /* Red Alert 1 */
#define CLIENTTAG_REDALERT_UINT 0x52414C54
#define CLIENTTAG_REDALERT2 "RAL2" /* Red Alert 2 */
#define CLIENTTAG_REDALERT2_UINT 0x52414C32
#define CLIENTTAG_DUNE2000 "DN2K" /* Dune 2000 */