X-Git-Url: http://git.shiar.nl/netris.git/blobdiff_plain/4f561019fc85c2817e3a72341397d1df32bc0868..b5a9cdfd671a10cd5b5e9f1f53105e9993414247:/server.c diff --git a/server.c b/server.c index f67721f..7d63e02 100644 --- a/server.c +++ b/server.c @@ -21,6 +21,7 @@ #define NOEXT #include "netris.h" + #include #include #include @@ -32,11 +33,14 @@ #include #include +#include "util.h" + #define HEADER_SIZE sizeof(netint4[3]) static struct option options[] = { { "wait", 0, 0, 'w' }, { "port", 1, 0, 'p' }, + { "quadra", 1, 0, 'q' }, { "min-players",1, 0, 'm' }, { "max-players",1, 0, 'x' }, { "continuous", 1, 0, 'c' }, @@ -49,14 +53,13 @@ static struct option options[] = { }; static char minplayers = 2; -static char countPlayers = 0; +static char maxplayers = 8; +static char playercount; static char verbose = 0; struct sockaddr_in addr; -static char *gameNames[GT_len] = { "OnePlayer", "ClassicTwo" }; - -ExtFunc MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event); +MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event); static EventGenRec netGen[MAX_SCREENS] = { { NULL, 0, FT_read, -1, NetGenFunc, EM_net, 0, "\0", 0, HEADER_SIZE } }; @@ -73,51 +76,13 @@ static EventGenRec *nextGen = &alarmGen; static sigjmp_buf close_env; -ExtFunc volatile void die(char *msg) -{ - perror(msg); - exit(1); -} //die - -ExtFunc int MyRead(int fd, void *data, int len) -{ - int result, left; - - left = len; - while (left > 0) { - result = read(fd, data, left); - if (result > 0) { - data = ((char *)data) + result; - left -= result; - } - else if (errno != EINTR) - return result; - } - return len; -} //MyRead - -ExtFunc int MyWrite(int fd, void *data, int len) -{ - int result, left; - - left = len; - while (left > 0) { - result = write(fd, data, left); - if (result > 0) { - data = ((char *)data) + result; - left -= result; - } - else if (errno != EINTR) - return result; - } - return len; -} //MyWrite - -ExtFunc void SendPacketTo(short playa, short uid, NetPacketType type, int size, void *data) +void SendPacketTo(short playa, short uid, NetPacketType type, int size, void *data) { //send to someone netint4 header[3]; if (netGen[playa].fd >= 0) { + if (verbose) + fprintf(stderr, ": send %d from %d to %d\n", type, uid, playa); header[0] = hton4(uid); header[1] = hton4(type); header[2] = hton4(size + HEADER_SIZE); @@ -133,41 +98,15 @@ static MyEventType AlarmGenFunc(EventGenRec *gen, MyEvent *event) return E_alarm; } //AlarmGenFunc -ExtFunc void AddEventGen(EventGenRec *gen) -{ - assert(gen->next == NULL); - assert(nextGen->next != (void*)0xffffffff); - gen->next = nextGen->next; - nextGen->next = gen; -} //AddEventGen - -ExtFunc void RemoveEventGen(EventGenRec *gen) -{ - // assert(gen->next != NULL); /* Be more forgiving, for SIGINTs */ - if (gen->next) { - while (nextGen->next != gen) - nextGen = nextGen->next; - nextGen->next = gen->next; - gen->next = NULL; - } -} //RemoveEventGen - -ExtFunc void AtExit(void (*handler)(void)) -{ //setup something to do at exit (^C) -#ifdef HAS_ON_EXIT - on_exit((void *)handler, NULL); -#else - atexit(handler); -#endif -} //AtExit - -ExtFunc void SCloseNet(short playa) +void SCloseNet(short playa) { //kick some connection's ass! MyEvent event; if (netGen[playa].fd >= 0) { - SendPacketTo(playa, 0, NP_endConn, 0, NULL); - do{} while (WaitMyEvent(&event, EM_net) != E_lostConn); + if (Players[playa].alive >= 0) { + SendPacketTo(playa, 0, NP_endConn, 0, NULL); + do{} while (WaitMyEvent(&event, EM_net) != E_lostConn); + } //say bye to player close(netGen[playa].fd); netGen[playa].fd = -1; } @@ -175,7 +114,7 @@ ExtFunc void SCloseNet(short playa) RemoveEventGen(&netGen[playa]); } //SCloseNet -ExtFunc void CloseNets(void) +void CloseNets(void) { //nou oogjes dicht en snaveltjes toe int i; @@ -185,60 +124,7 @@ ExtFunc void CloseNets(void) fprintf(stderr, "* All Done\n\n"); } //CloseNets -ExtFunc MyEventType WaitMyEvent(MyEvent *event, int mask) -{ //poll - int i, retry = 0; - fd_set fds[FT_len]; - EventGenRec *gen; - int result, anyReady, anySet; - struct timeval tv; - - for (;;) { - for (i = 0; i < FT_len; ++i) - FD_ZERO(&fds[i]); - anyReady = anySet = 0; - gen = nextGen; - do { - if (gen->mask & mask) { - if (gen->ready) - anyReady = 1; - if (gen->fd >= 0) { - FD_SET(gen->fd, &fds[gen->fdType]); - anySet = 1; - } - } - gen = gen->next; - } while (gen != nextGen); - if (anySet) { - tv.tv_sec = 0; - tv.tv_usec = (retry && !anyReady) ? 500000 : 0; - result = select(FD_SETSIZE, &fds[FT_read], &fds[FT_write], - &fds[FT_except], anyReady ? &tv : NULL); - } - else { - if (retry && !anyReady) - sleep(1); - result = 0; - } - gen = nextGen; - do { - if ((gen->mask & mask) - && (gen->ready || (result > 0 && gen->fd >= 0 - && FD_ISSET(gen->fd, &fds[gen->fdType])))) { - gen->ready = 0; - event->type = gen->func(gen, event); - if (event->type != E_none) { - nextGen = gen->next; - return event->type; - } - } - gen = gen->next; - } while (gen != nextGen); - retry = 1; - } -} //WaitMyEvent - -ExtFunc MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event) +MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event) { //receive int result; short uid, type, size; @@ -284,7 +170,7 @@ static MyEventType ConnGenFunc(EventGenRec *gen, MyEvent *event) addrLen = sizeof(addr); for (new = 1; new <= MAX_SCREENS; new++) if (netGen[new].fd < 0) break; - if (new > Game.maxplayers) return; + if (new > maxplayers) return; if ((netGen[new].fd = accept(gen->fd, (struct sockaddr *)&addr, &addrLen)) < 0) @@ -313,22 +199,38 @@ static MyEventType ConnGenFunc(EventGenRec *gen, MyEvent *event) return E_connect; } //ConnGenFunc -ExtFunc int StartServer(void) +void CountPlayers(void) +{ //count number of players/teams + int i, j; + playercount = 0; + for (i = 1; i < MAX_SCREENS; i++) if (Players[i].alive > 0) { + if (Players[i].team < 128) for (j = 1; j < i; j++) + if (Players[j].alive > 0 && (Players[j].team == Players[i].team)) { + playercount--; + break; + } //player of same team counted before + playercount++; + } //player alive +} //CountPlayers + +int StartServer(void) { MyEvent event; netint2 currentpiece[MAX_SCREENS]; - int playercount; int playersReady = 0; + int paused = 1; int i; + char teams[10][7] = { "", "Green", "Cyan", "Blue", "Purple", + "Red", "Grey", "White", "*Orange" }; do { switch (WaitMyEvent(&event, EM_any)) { case E_lostConn: //client went away :( - Players[event.u.net.sender].alive = 0; + Players[event.u.net.sender].alive = -1; for (i = 1; i < MAX_SCREENS; i++) - if (Players[i].alive) + if (Players[i].alive >= 0) SendPacketTo(i, event.u.net.sender, - NP_argghhh, sizeof(Players[0].alive), + NP_part, sizeof(Players[0].alive), &Players[event.u.net.sender].alive); SCloseNet(event.u.net.sender); break; //NP_endConn @@ -342,6 +244,7 @@ ExtFunc int StartServer(void) netint4 versiondata[2]; char data[255]; int major; + int protocolVersion; memcpy(versiondata, event.u.net.data, sizeof(versiondata)); @@ -366,14 +269,26 @@ ExtFunc int StartServer(void) //receive player details and return other players memcpy(&Players[event.u.net.sender], event.u.net.data, event.u.net.size); - if (!Players[event.u.net.sender].team) - Players[event.u.net.sender].team = - 256 - event.u.net.sender; + if (Players[event.u.net.sender].team < 1 + || Players[event.u.net.sender].team > 7) { + int team; + + for (team = 1; team < 7; team++) { + for (i = 1; i < MAX_SCREENS; i++) + if ((Players[i].alive > 0) && (Players[i].team == team)) + break; //team in use + if (i==MAX_SCREENS) break; + } //find unused team + Players[event.u.net.sender].team = team; + SendPacketTo(event.u.net.sender, event.u.net.sender, NP_team, + sizeof(Players[event.u.net.sender].team), + &Players[event.u.net.sender].team); + } //invalid team if (Game.started < 2) Players[event.u.net.sender].flags |= SCF_paused; if (!Game.continuous && Game.started >= 2) { char data[40]; - strcpy(data,"Can't join: Game has already started"); + strcpy(data, "Can't join: Game has already started"); fprintf(stderr, "- Can't join player #%d in " "non-continuous game\n", event.u.net.sender); SendPacketTo(event.u.net.sender, 0, NP_error, @@ -384,7 +299,7 @@ ExtFunc int StartServer(void) { static struct { int playerflags; - int maxplayers; //1 + int gravity; //1 int started; //2 int continuous; //3 long seed; //4 @@ -393,7 +308,7 @@ ExtFunc int StartServer(void) memcpy(&data, &Players[event.u.net.sender].flags, sizeof(data.playerflags)); - memcpy(&data.maxplayers, &Game, + memcpy(&data.gravity, &Game, sizeof(data) - sizeof(data.playerflags)); SendPacketTo(event.u.net.sender, 0, NP_gamedata, sizeof(data), &data); @@ -401,39 +316,33 @@ ExtFunc int StartServer(void) for (i = 1; i < MAX_SCREENS; i++) if (netGen[i].fd >= 0 && i != event.u.net.sender) { SendPacketTo(event.u.net.sender, i, - NP_newPlayer, sizeof(Player) - - sizeof(Players[0].spy) - - sizeof(Players[0].small), - &Players[i]); - SendPacketTo(event.u.net.sender, i, - NP_newPiece, sizeof(currentpiece[i]), - ¤tpiece[i]); - SendPacketTo(i, event.u.net.sender, - NP_newPlayer, sizeof(Player) - - sizeof(Players[0].spy) - - sizeof(Players[0].small), - &Players[event.u.net.sender]); + NP_newPlayer, sizeof(_Player), &Players[i]); + SendPacketTo(event.u.net.sender, i, NP_newPiece, + sizeof(Players[i].curShape), &Players[i].curShape); + SendPacketTo(i, event.u.net.sender, NP_newPlayer, + sizeof(_Player), &Players[event.u.net.sender]); } //send (to) players - fprintf(stderr, "> Joined player #%d: %s <%s>\n", + fprintf(stderr, "> Joined player #%d: %s <%s> (%s)\n", event.u.net.sender, Players[event.u.net.sender].name, - Players[event.u.net.sender].host); + Players[event.u.net.sender].host, + teams[Players[event.u.net.sender].team]); if (++playersReady >= minplayers) { - if (Game.started) + if (Game.started > 1) SendPacketTo(event.u.net.sender, 0, NP_start, 0, NULL); - else { +/* else { fprintf(stderr, "* Starting game (%010d)\n", Game.seed); for (i = 1; i < MAX_SCREENS; i++) SendPacketTo(i, 0, NP_start, 0, NULL); Game.started++; - } //first goahead (to all) + } //first goahead (to all)*/ } //give go ahead break; //NP_playerdata case NP_newPiece: - memcpy(¤tpiece[event.u.net.sender], - event.u.net.data, sizeof(currentpiece[0])); + memcpy(&Players[event.u.net.sender].curShape, + event.u.net.data, sizeof(Players[0].curShape)); goto sendtoall; case NP_argghhh: Players[event.u.net.sender].alive = 0; @@ -442,18 +351,22 @@ ExtFunc int StartServer(void) //check for unpaused game case NP_pause: { - int paused; Players[event.u.net.sender].flags ^= SCF_paused; paused = Game.started < 1; - for (i = 1; i < MAX_SCREENS; i++) if (Players[i].alive) - paused |= Players[i].flags & SCF_paused; + for (i = 1; i < MAX_SCREENS; i++) + if (Players[i].alive > 0) + paused |= Players[i].flags & SCF_paused; + fprintf(stderr, "* Player #%d (un)paused (pause=%d)\n", + event.u.net.sender, paused); if (paused) paused = 1; - else if (Game.started == 1) Game.started++; goto sendtoall; } //NP_pause default: //relay data to all players sendtoall: // if (event.u.net.type >= NP_pause) + if (event.u.net.type >= NP_rotright + && Game.started < 2) + break; for (i = 1; i < MAX_SCREENS; i++) if (i != event.u.net.sender) if (event.u.net.type != NP_giveJunk || @@ -474,34 +387,50 @@ ExtFunc int StartServer(void) break; } //E_connect } //event - { - int j; - playercount = 0; - for (i = 1; i < MAX_SCREENS; i++) if (Players[i].alive) { - if (Players[i].team < 128) for (j = 1; j < i; j++) - if (Players[j].alive - && (Players[j].team == Players[i].team)) { - playercount--; - break; - } //player of same team counted before - playercount++; - } //player alive - } //count players - } while (Game.started < 2 || playercount > 1 || Game.continuous); + CountPlayers(); + if (Game.started < 1) { + if (playercount > 1) { + fprintf(stderr, "* Game (%010d) ready to start\n", Game.seed); + Game.started++; + } //give goahead + } //game not yet started + else { + if (playercount < 2) { + fprintf(stderr, "* Stopping game\n"); + if (Game.seed) Game.seed++; + if (Game.started > 1) for (i = 1; i < MAX_SCREENS; i++) + if (Players[i].alive >= 0) { + Players[i].alive = 1; + Players[i].flags |= SCF_paused; + SendPacketTo(i, 0, NP_stop, + sizeof(Game.seed), &Game.seed); + } //transmit game stop and set players not ready + paused = 1; + Game.started = 0; + } //too few players for game + if (Game.started == 1 && !paused) { + Game.started++; + fprintf(stderr, "* Game starts\n"); + for (i = 1; i < MAX_SCREENS; i++) + if (Players[i].alive > 0) + SendPacketTo(i, 0, NP_start, 0, NULL); + } //everybody ready to start + } //game (ready to) start(ed) + } while (1); fprintf(stderr, "* Exiting server\n"); } //StartServer -ExtFunc void Header(void) +void SHeader(void) { fprintf(stderr, "NETRIS Server %s\t(c) 2002 Shiar \n\n", version_string); -} //Header +} -ExtFunc void Usage(void) +void SUsage(void) { - Header(); + SHeader(); fprintf(stderr, "Usage: netris \n" "\n" @@ -518,27 +447,7 @@ ExtFunc void Usage(void) "\n", DEFAULT_PORT); } -ExtFunc void DistInfo(void) -{ - Header(); - fprintf(stderr, - "This program is free software; you can redistribute it and/or modify\n" - "it under the terms of the GNU General Public License as published by\n" - "the Free Software Foundation; either version 2 of the License, or\n" - "(at your option) any later version.\n" - "\n" - "This program is distributed in the hope that it will be useful,\n" - "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - "GNU General Public License for more details.\n" - "\n" - "You should have received a copy of the GNU General Public License\n" - "along with this program; if not, write to the Free Software\n" - "Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n" - "\n"); -} //DistInfo - -ExtFunc void WriteConf(void) +void WriteConf(void) { FILE *file_out; @@ -554,7 +463,7 @@ ExtFunc void WriteConf(void) fprintf(stderr, "Wrote new game configuration to %s\n", CONFIG_FILE); } //WriteConf -ExtFunc void HandleOption(char tag, char *value) +void HandleOption(char tag, char *value) { switch (tag) { case 'v': //verbose @@ -570,9 +479,12 @@ ExtFunc void HandleOption(char tag, char *value) minplayers = atoi(value); break; case 'x': //max-players - Game.maxplayers = atoi(value); - if (Game.maxplayers >= MAX_SCREENS) - Game.maxplayers = MAX_SCREENS; + maxplayers = atoi(value); + if (maxplayers >= MAX_SCREENS) + maxplayers = MAX_SCREENS; + break; + case 'q': //quadra-style gravity + Game.gravity ^= 1; break; case 'i': //speed (of level 1) Game.initspeed = atof(value) * 1e6; @@ -581,15 +493,16 @@ ExtFunc void HandleOption(char tag, char *value) Game.seed = atoi(value); break; case 'H': //info + SHeader(); DistInfo(); exit(0); case 'h': //help - Usage(); exit(0); + SUsage(); exit(0); default: break; } } //HandleParam -ExtFunc void ReadConf(char *filename) +void ReadConf(char *filename) { FILE *file_in; char buf[513]; @@ -624,36 +537,43 @@ ExtFunc void ReadConf(char *filename) } //ReadConf -ExtFunc void CatchInt(int sig) +void CatchInt(int sig) { siglongjmp(close_env, 1); } -ExtFunc int main(int argc, char **argv) +int main(int argc, char **argv) { char ch; if (sigsetjmp(close_env, 1)) exit(0); signal(SIGINT, CatchInt); port = DEFAULT_PORT; - Game.maxplayers = 8; + maxplayers = 8; Game.initspeed = DEFAULT_INTERVAL; Game.seed = time(0); + Game.gravity = 0; + { + int i; + + for (i = 1; i < MAX_SCREENS; i++) + Players[i].alive = -1; + } // if (getopt(argc, argv, "f:") == 'f') // ReadConf(optarg); // else ReadConf(CONFIG_FILE); while ((ch = getopt_long(argc, argv, - "hHvp:i:s:c:m:x:", options, NULL)) != -1) + "hHvqp:i:s:c:m:x:", options, NULL)) != -1) HandleOption(ch, optarg); if (optind < argc) { - Usage(); + SUsage(); exit(1); } // WriteConf(); - Header(); + SHeader(); { int i;