diff options
| author | Tim Angus <tim@ngus.net> | 2009-10-03 11:52:53 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:28 +0000 |
| commit | b47a49a03370e7ea42f47623b9f72a5ca799f0e7 (patch) | |
| tree | 9d64d778ded2971d7ebd05970d903d886bd81436 /src/server/sv_main.c | |
| parent | 09ceb08b95978feb0a9b737f22ac0f662c7465d6 (diff) | |
* Merge ioq3-r1423
+ IPv6
+ VoIP
+ Stereo rendering
+ Other minor stuff
Diffstat (limited to 'src/server/sv_main.c')
| -rw-r--r-- | src/server/sv_main.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/server/sv_main.c b/src/server/sv_main.c index 2940d95c..7b66aa6f 100644 --- a/src/server/sv_main.c +++ b/src/server/sv_main.c @@ -23,6 +23,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "server.h" +#ifdef USE_VOIP +cvar_t *sv_voip; +#endif + serverStatic_t svs; // persistant server info server_t sv; // local server vm_t *gvm = NULL; // game virtual machine @@ -247,16 +251,14 @@ void SV_MasterHeartbeat( void ) { sv_master[i]->modified = qfalse; Com_Printf( "Resolving %s\n", sv_master[i]->string ); - if ( !NET_StringToAdr( sv_master[i]->string, &adr[i] ) ) { + if ( !NET_StringToAdr( sv_master[i]->string, &adr[i], NA_UNSPEC ) ) { Com_Printf( "Couldn't resolve address: %s\n", sv_master[i]->string ); continue; } if ( !strchr( sv_master[i]->string, ':' ) ) { adr[i].port = BigShort( PORT_MASTER ); } - Com_Printf( "%s resolved to %i.%i.%i.%i:%i\n", sv_master[i]->string, - adr[i].ip[0], adr[i].ip[1], adr[i].ip[2], adr[i].ip[3], - BigShort( adr[i].port ) ); + Com_Printf( "%s resolved to %s\n", sv_master[i]->string, NET_AdrToStringwPort(adr[i])); } @@ -300,7 +302,7 @@ void SV_MasterGameStat( const char *data ) return; // only dedicated servers send stats Com_Printf( "Resolving %s\n", MASTER_SERVER_NAME ); - if( !NET_StringToAdr( MASTER_SERVER_NAME, &adr ) ) + if( !NET_StringToAdr( MASTER_SERVER_NAME, &adr, NA_IP ) ) { Com_Printf( "Couldn't resolve address: %s\n", MASTER_SERVER_NAME ); return; @@ -417,6 +419,12 @@ void SVC_Info( netadr_t from ) { va("%i", sv_maxclients->integer - sv_privateClients->integer ) ); Info_SetValueForKey( infostring, "pure", va("%i", sv_pure->integer ) ); +#ifdef USE_VOIP + if (sv_voip->integer) { + Info_SetValueForKey( infostring, "voip", va("%i", sv_voip->integer ) ); + } +#endif + if( sv_minPing->integer ) { Info_SetValueForKey( infostring, "minPing", va("%i", sv_minPing->integer) ); } |