[ViewVC] Diff of: Oni2/Daodan/MSVC/Flatline

Comparing Daodan/MSVC/Flatline_Server.c (file contents):
Revision 583 by gumby, Sat Jan 22 16:28:52 2011 UTC vs.
Revision 586 by gumby, Wed Feb 2 08:17:19 2011 UTC

+        message_size = sprintf(message.data + 1, "%s", name);
+        UDPServer_SendToAll(&message, message_size + 2 + FLATLINE_HEADER);
-+
+}
-+
+void FLsSend_BINACHAR( short j, sockaddr* socket )
-+
+{
-+
-+
+        ActiveCharacter* AC = ONrGetActiveCharacter( PlayerList[j]->Chr);
-+
+        flatline_packet new_char = {0};
-+
+        CharacterObject* Char = &new_char.new_player.Character;
-+
-+
+        new_char.id = NEW_PLAYER;
-+
+        new_char.new_player.Playernumber = j;
-+
-+
+//      memset(Char, 0, sizeof(CharacterObject));
-+
+        Char->Header.Type = 'CHAR';
-+
+        Char->OSD.Options = chr_dontaim;
-+
-+
+        sprintf(Char->OSD.Name,"%s",PlayerList[j]->name);
-+
-+
+        sprintf(Char->OSD.Class, "%s", TMrInstance_GetInstanceName(PlayerList[j]->Chr->ONCC));
-+
-+
+        if(AC)
-+
+        {
-+
+                Char->Header.Position = AC->PhyContext->Position;
-+
+        }
-+
+        else
-+
+        {
-+
+                Char->Header.Position.X = 0;
-+
+                Char->Header.Position.Y = 0;
-+
+                Char->Header.Position.Z = 0;
-+
+        }
-+
-+
+        NetTCPServer_Send(socket, (char*)&new_char, sizeof(new_player) + FLATLINE_HEADER );
-+
+}
-+
+bool FLrServer_PacketCallback(char* data, int datalen, int from)
-+
+{
-+
+        int i, j;
-+
+        bool found_player = 0;
-+
+        flatline_packet * packet = (flatline_packet*)data;
-+
+        static int recieved = 0;
-+
+        sockaddr_in sender;
-+
+        sender.sin_family = AF_INET;
-+
+        sender.sin_port = htons(27777);
-+
+        sender.sin_addr = *((struct in_addr*)(int*)&from);
-+
-+
-+
+        //packet->data[datalen] = '\0';
-+
-+
+        //DDrConsole_PrintF("Packet \r%d recieved from %i",  ++recieved, from);
-+
-+
-+
-+
+        //if data[0] != CONNECT_SEND, search in playerlist for ip address
-+
-+
-+
-+
-+
+        switch(packet->id) {
-+
+                flatline_packet connect_recv;
-+
+                player_info * playah;
-+
+                //rewrite this when we get TCP support.
-+
+                //rewrite this before we get TCP support*
-+
+                //the way of seeing if there is room for players sucks.
-+
+        case CONNECT_SEND:
-+
+                ;
-+
-+
+                connect_recv.id = CONNECT_REPLY;
-+
-+
+                //if(Players[i].ip == sender.sin_addr.S_un.S_addr) break; //needs to send an error message
-+
+                sender.sin_addr.S_un.S_addr = htonl(sender.sin_addr.S_un.S_addr);
-+
+                playah = FLrServer_AddPlayer(from,packet->connect_send.name, 0, 0);
-+
+                DDrConsole_PrintF("%s connected from %s", packet->connect_send.name, inet_ntoa(sender.sin_addr ) );
-+
+                if(!((int)playah > -5 && (int)playah <= 0)) {
-+
-+
+                        connect_recv.connect_reply.goodtogo = 1;
-+
+                        connect_recv.connect_reply.player_slot = playah->list_slot;
-+
+                        //DDrConsole_PrintF("Slot: %i", playah->list_slot);
-+
-+
+                        //sending this several times to make sure it gets through. Really need to make up some form of packet tracking.
-+
+                        NetUDPServer_Send((sockaddr *) &sender, (char*)&connect_recv, sizeof(connect_reply) + FLATLINE_HEADER);
-+
+                        NetUDPServer_Send((sockaddr *) &sender, (char*)&connect_recv, sizeof(connect_reply) + FLATLINE_HEADER);
-+
+                        NetUDPServer_Send((sockaddr *) &sender, (char*)&connect_recv, sizeof(connect_reply) + FLATLINE_HEADER);
-+
+                        NetUDPServer_Send((sockaddr *) &sender, (char*)&connect_recv, sizeof(connect_reply) + FLATLINE_HEADER);
-+
+                        NetUDPServer_Send((sockaddr *) &sender, (char*)&connect_recv, sizeof(connect_reply) + FLATLINE_HEADER);
-+
+                        Sleep(100);
-+
-+
-+
-+
+                        for(j = 0; j < max_connections; j++) {
-+
+                                if(PlayerList[j] != 0) {
-+
+                                        FLsSend_BINACHAR( j, (sockaddr *)&sender);
-+
+                                }
-+
-+
+                        }
-+
+                }
-+
+                else {
-+
+                        //fix the error messages...
-+
+                        DDrConsole_PrintF("Server is full. :(");
-+
+                        connect_recv.connect_reply.goodtogo = 0;
-+
+                        sender.sin_addr.S_un.S_addr = htonl(sender.sin_addr.S_un.S_addr);
-+
+                        memcpy(&connect_recv.connect_reply.message,"Server is full.", sizeof("Server is full."));
-+
+                        NetTCPServer_Send((sockaddr *) &sender, (char*)&connect_recv, sizeof(bool)*2 + FLATLINE_HEADER + sizeof("Server is full."));
-+
-+
+                }
-+
-+
-+
+                break;
-+
+        case CONNECT_REPLY:
-+
+                break;  //do nothing...a server shouldn't recieve this type of packet.
-+
+        case MESSAGE:
-+
+                for(i = 0; i < MAX_PLAYERS; i++) {
-+
+                        //DDrConsole_PrintF("%i : %i | %s : %s", from, Players[i].ip, inet_ntoa(*(struct in_addr*)&from), inet_ntoa(*(struct in_addr*)&(Players[i].ip)));
-+
+                        if(Players[i].ip == sender.sin_addr.S_un.S_addr) {
-+
+                                found_player = 1;
-+
+                                break;
-+
+                        }
-+
+                }
-+
+                if(found_player == 0) break;
-+
+                else {
-+
+                        char message_buffer[512] = {0};
-+
+                        flatline_packet message;
-+
+                        int message_size;
-+
+                        data[datalen] = 0;
-+
-+
+                        DDrConsole_PrintF("%s: %s", Players[i].name, packet->data);
-+
+                        sprintf(message_buffer, "%s: %s", Players[i].name, packet->data);
-+
-+
+                        message.id = MESSAGE;
-+
+                        message_size = sprintf(message.data, "%s", message_buffer);
-+
+                        COrMessage_Print(message_buffer, "chat", 0);
-+
+                        UDPServer_SendToAll(&message, message_size + 1 + FLATLINE_HEADER);
-+
+                        break;
-+
+                }
-+
+        case CHANGE_NAME:
-+
+                for(i = 0; i < MAX_PLAYERS; i++) {
-+
+                        if(PlayerList[i] && PlayerList[i]->ip == sender.sin_addr.S_un.S_addr) {
-+
+                                found_player = 1;
-+
+                                break;
-+
+                        }
-+
+                }
-+
+                if(found_player == 0) break;
-+
+                else {
-+
+                        bool name_exists = 0;
-+
+                        for(j = 0; j < MAX_PLAYERS; j++) {
-+
+                                if(PlayerList[j] && !strcmp(packet->data, PlayerList[j]->name)) {
-+
+                                        name_exists = 1;
-+
+                                        break;
-+
+                                }
-+
+                        }
-+
+                        if(!name_exists) {
-+
+                                FLsUpdateName( i, packet->data );
-+
+                        }
-+
+                        break;
-+
+                }
-+
+        case PLAYER_INPUT:
-+
-+
+                for(i = 0; i < max_connections; i++) {
-+
+                        if(PlayerList[i] != 0 && PlayerList[i]->ip == sender.sin_addr.S_un.S_addr) {
-+
+                                found_player = 1;
-+
+                                break;
-+
+                        }
-+
+                }
-+
-+
+                if(found_player == 0) break;
-+
+                else {
-+
+                        input_struct * packet_input = &packet->input_struct;
-+
-+
-+
+                        PlayerList[i]->InputFromClient.Actions1 = packet_input->Actions1;
-+
+                        PlayerList[i]->InputFromClient.Actions2 = packet_input->Actions2;
-+
+                        PlayerList[i]->InputFromClient.MouseDeltaX = packet_input->MouseDeltaX;
-+
+                        PlayerList[i]->InputFromClient.MouseDeltaY = packet_input->MouseDeltaY;
-+
+                        PlayerList[i]->FacingFromClient = packet_input->DesiredFacing;
-+
+                        //PlayerList[i]->LastInputTime = packet_input->Time;
-+
-+
+                        break;
-+
+                }
-+
+        case PK_PONG:
-+
+                for(i = 0; i < max_connections; i++) {
-+
+                        if(PlayerList[i] != 0 && PlayerList[i]->ip == sender.sin_addr.S_un.S_addr) {
-+
+                                found_player = 1;
-+
+                                break;
-+
+                        }
-+
+                }
-+
-+
+                if(found_player == 0) break;
-+
+                if(packet->ping != lastPingTime)
-+
+                {
-+
+                        PlayerList[i]->Ping = 999;
-+
+                }
-+
+                else
-+
+                {
-+
+                        PlayerList[i]->Ping = GetTickCount() - packet->ping;
-+
+                }
-+
+                break;
-+
+        case PK_MISSING_PLAYER:
-+
+                if(packet->integer < MAX_PLAYERS)
-+
+                {
-+
+                        FLsSend_BINACHAR( packet->integer, &sender);
-+
+                }
-+
+                break;
-+
+        default:
-+
+                DDrConsole_PrintF("Warning, recieved badly formed packet!");
-+
+                break;
-+
+        }
-+
+        return true;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines (old)
->
+Changed lines (new)

Comparing Daodan/MSVC/Flatline_Server.c (file contents): Revision 583 by gumby, Sat Jan 22 16:28:52 2011 UTC vs. Revision 586 by gumby, Wed Feb 2 08:17:19 2011 UTC

Diff Legend

Comparing Daodan/MSVC/Flatline_Server.c (file contents):
Revision 583 by gumby, Sat Jan 22 16:28:52 2011 UTC vs.
Revision 586 by gumby, Wed Feb 2 08:17:19 2011 UTC