[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src/network master.c
From: |
Jimmy Salmon |
Subject: |
[Stratagus-CVS] stratagus/src/network master.c |
Date: |
Wed, 15 Oct 2003 20:36:06 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Jimmy Salmon <address@hidden> 03/10/15 20:36:06
Modified files:
src/network : master.c
Log message:
Fixed warning, cleanup
Patches:
Index: stratagus/src/network/master.c
diff -u stratagus/src/network/master.c:1.18 stratagus/src/network/master.c:1.19
--- stratagus/src/network/master.c:1.18 Tue Oct 14 23:04:05 2003
+++ stratagus/src/network/master.c Wed Oct 15 20:36:06 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: master.c,v 1.18 2003/10/15 03:04:05 mr-russ Exp $
+// $Id: master.c,v 1.19 2003/10/16 00:36:06 jsalmon3 Exp $
//@{
@@ -48,15 +48,10 @@
#include "stratagus.h"
#include "iocompat.h"
-
#include "network.h"
#include "netconnect.h"
#include "ccl.h"
#include "master.h"
-
-// FIXME: jim4: why is this defined?
-#define USE_WINSOCK
-
#include "net_lowlevel.h"
#ifdef USE_SDLA
@@ -68,7 +63,7 @@
----------------------------------------------------------------------------*/
//###### For Magnant META SERVER
-local Socket sockfd; // This is a TCP socket.
+local Socket MetaServerFildes; // This is a TCP socket.
global int MetaServerInUse;
/*----------------------------------------------------------------------------
@@ -83,23 +78,21 @@
*/
global int MetaInit(void)
{
- int TCPConnectStatus; // = 0 if not successful, -1 if not.
int i;
char* reply;
reply = NULL;
- sockfd = NetworkFildes;
+ MetaServerFildes = NetworkFildes;
for (i = 1234; i < 1244; ++i) {
- sockfd = NetOpenTCP(i); //FIXME: need to make a dynamic port allocation
there...if (!sockfd) {...}
- if (sockfd != -1) {
+ MetaServerFildes = NetOpenTCP(i); //FIXME: need to make a dynamic
port allocation there...if (!MetaServerFildes) {...}
+ if (MetaServerFildes != (Socket)-1) {
break;
}
}
// FIXME: Configurable Meta Server
- TCPConnectStatus = NetConnectTCP(sockfd, NetResolveHost(MASTER_HOST),
MASTER_PORT);
-
- if (TCPConnectStatus == -1) {
+ i = NetConnectTCP(MetaServerFildes, NetResolveHost(MASTER_HOST),
MASTER_PORT);
+ if (i == -1) {
//TODO: Notify player that connection was aborted...
return -1;
}
@@ -131,7 +124,7 @@
*/
global int MetaClose(void)
{
- NetCloseTCP(sockfd);
+ NetCloseTCP(MetaServerFildes);
return 0;
}
@@ -220,7 +213,8 @@
// Message Structure
// <Stratagus> if for Magnant Compatibility, it may be removed
// Player Name, Game Name, VERSION, Command, **Paramaters**
- sprintf(s, "<Stratagus>\n%s\n%s\n%s\n%s\n", LocalPlayerName, GameName,
VERSION, command);
+ sprintf(s, "<Stratagus>\n%s\n%s\n%s\n%s\n",
+ LocalPlayerName, GameName, VERSION, command);
// Commands
// Login - password
@@ -260,7 +254,7 @@
}
strcat(s, p);
size = strlen(s);
- ret = NetSendTCP(sockfd, s, size);
+ ret = NetSendTCP(MetaServerFildes, s, size);
free(p);
free(s);
return ret;
@@ -278,22 +272,22 @@
char* p;
char buf[1024];
- if (NetSocketReady(sockfd, 5000) == -1) {
+ if (NetSocketReady(MetaServerFildes, 5000) == -1) {
return -1;
}
p = NULL;
// FIXME: Allow for large packets
- n = NetRecvTCP(sockfd, &buf, 1024);
+ n = NetRecvTCP(MetaServerFildes, &buf, 1024);
if (!(p = malloc(n + 1))) {
return -1;
}
// We know we now have the whole command.
// Convert to standard notation
- buf[n-1] = '\0';
- buf[n-2] = '\n';
+ buf[n - 1] = '\0';
+ buf[n - 2] = '\n';
strcpy(p, buf);
*reply = p;
- [Stratagus-CVS] stratagus/src/network master.c, Russell Smith, 2003/10/13
- [Stratagus-CVS] stratagus/src/network master.c, Jimmy Salmon, 2003/10/13
- [Stratagus-CVS] stratagus/src/network master.c, Jimmy Salmon, 2003/10/13
- [Stratagus-CVS] stratagus/src/network master.c,
Jimmy Salmon <=
- [Stratagus-CVS] stratagus/src/network master.c, Mohydine, 2003/10/17
- [Stratagus-CVS] stratagus/src/network master.c, Mohydine, 2003/10/17
- [Stratagus-CVS] stratagus/src/network master.c, Jimmy Salmon, 2003/10/17