Changeset 588 for Daodan/MSVC

Timestamp:

Feb 11, 2011, 9:21:14 AM (14 years ago)

Author:

gumby

Message:

 

Location:

Daodan/MSVC

Files:

• FixedDaodan.suo (modified) ( previous)
• Flatline.c (modified) (1 diff)
• Flatline_BSL.c (modified) (1 diff)
• Flatline_Net.h (added)
• Flatline_Server.c (modified) (2 diffs)
• Mariusnet.c (modified) (17 diffs)
• Mariusnet_Defs.h (modified) (2 diffs)
• Mariusnet_Public.h (modified) (1 diff)
• PortForwardWrapper.cpp (added)
• PortForwardWrapper.h (added)

Daodan/MSVC/Flatline.c

@@ -27 +27 @@
 
 
-bool FLrServer_Run()
-{
-        // Get the local hostname
-        char szHostName[255];
-        struct hostent *host_entry;
-        gethostname(szHostName, 255);
-
-        host_entry=gethostbyname(szHostName);
-        DDrConsole_PrintF("Server started at %s...", inet_ntoa (*(struct in_addr *)*host_entry->h_addr_list));
-        return NetUDPServer_Listen(27777, FLrServer_PacketCallback);
-}
+
 
 short TRrAnimation_GetType(char* anim)

Daodan/MSVC/Flatline_BSL.c

@@ -63 +63 @@
                 sprintf(message.data, "%s", args[0].value_str32);
                 NetUDPSocket_Send(client_sock, (sockaddr*)&address, (char*)&message, 257);
+        }
+        else if(MsNet_Running) {
+                MSNet_SendChat( args[0].value_str32 );
         }
         else {

Daodan/MSVC/Flatline_Server.c

@@ -2 +2 @@
 #include "Flatline_Server.h"
 #include <Windows.h>
-
+#include "PortForwardWrapper.h"
 //I hereby apologize for the uglyness of the below code. 
 //It was never intended to be "final" code, much less shared with anyone
@@ -376 +376 @@
         return true;
 }
+
+
+
+bool FLrServer_Run()
+{
+        HRESULT ret;
+        PortMappingContainer_C PMC = 
+        {
+                "", 
+                "27777",
+                "27777",
+                "UDP",
+                "",
+                "",
+                "Flatline!"
+        };
+        // Get the local hostname
+        char szHostName[255];
+        struct hostent *host_entry;
+        gethostname(szHostName, 255);
+
+        host_entry=gethostbyname(szHostName);
+
+        strcpy( PMC.InternalClient, inet_ntoa (*(struct in_addr *)*host_entry->h_addr_list) );
+        ret = uPnP_Forward( &PMC );
+        if(!ret)
+        {
+                DDrConsole_Print( "Port Forwarded" );
+        }
+        else
+        {
+                LPSTR Message;
+                FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM, &ret,0,0,&Message,0,NULL);
+                DDrConsole_Print( Message );
+        }
+
+        DDrConsole_PrintF("Server started at %s...", inet_ntoa (*(struct in_addr *)*host_entry->h_addr_list));
+        return NetUDPServer_Listen(27777, FLrServer_PacketCallback);
+}

Daodan/MSVC/Mariusnet.c

@@ -20 +20 @@
 bool RoomListGotten = 0;
 
-bool Are_We_Logged_In = 0;
-
-RGBA blue =             {0xFF, 0, 0, 0};
+bool MariusNet_LoggedIn = 0;
+
+bool MsNet_Running = 0;
+int Marius_Socket = -1;
+int Room_Socket = -1;
+sockaddr_in RoomAddr = {0};
+int PlayerID = 0;
+/*
+
 RGBA green =    {0, 0xFF, 0, 0};
 RGBA red =              {0, 0, 0xFF, 0};
 
 RGBA grey = {0x80,0x80,0x80,0x80};
-
+*/
+extern RGBA red;
+//extern RGBA blue;
+RGBA blue =             {0xFF, 0, 0, 0};
+RGBA cyan =             {0xFF, 0xFF, 0, 0};
+RGBA white =            {0xFF, 0xFF, 0xFF, 0};
+extern RGBA green;
+extern RGBA grey;
 int MariusNet_OutgoingPacketWrapper(int socket, const sockaddr* address, marius_packet* data, short datalen)
 {
@@ -259 +272 @@
 
 }
+
+void MSNet_HandleChat( m_message* msg )
+{
+        //BGRA *cough*
+        /*RGBA chatcolor;
+        chatcolor.R = (msg->PrimaryColor.Red);
+        chatcolor.G = (msg->PrimaryColor.Green);
+        chatcolor.B = (msg->PrimaryColor.Blue);
+        chatcolor.A = 0;*/
+        char Message[1024];
+        int NameLen = sprintf_s( Message, 1024, "%s", msg->Message ) + 1;
+        sprintf_s( Message, 1024 - NameLen, "%s: %s", Message, msg->Message + NameLen );
+        //DDrConsole_PrintColored( msg->Message, 0, chatcolor,white );
+        DDrConsole_Print(Message);
+}
+
+void MSNet_SendChat( char* msg )
+{
+        marius_packet mPacket = {0}; 
+        int len;
+        if(!MsNet_Running || !MariusNet_LoggedIn) return;
+        
+        Initialize_MPacket(&mPacket, pt_ChatMessage);
+
+        
+        mPacket.message.SecondaryColor.Red = mPacket.message.SecondaryColor.Flags = -1;
+        
+
+
+        //mPacket.message.Message = 'Gumby';
+        len = sprintf(mPacket.message.Message, "O %s", msg );
+        mPacket.message.Message[1] = 0;
+        mPacket.message.SenderId = htonl(PlayerID);
+        //mPacket.message.TargetId = -1;
+        MariusNet_OutgoingPacketWrapper(Room_Socket, (sockaddr*)&RoomAddr, (char*)&mPacket, 
+                sizeof(marius_header) + sizeof(m_message) - (255 - len) );
+
+
+}
+
+int MSNet_Cleanup()
+{
+        if( Marius_Socket != -1) closesocket(Marius_Socket);
+        Marius_Socket = -1;
+        if( Room_Socket != -1) closesocket(Room_Socket);
+        Room_Socket = -1;
+        memset(RoomList, 0, sizeof(m_room) * 64 );
+        DDrConsole_PrintF("The metaserver connection will now close." );
+        MsNet_Running = 0;
+        MariusNet_LoggedIn = 0;
+        return 1;
+}
+
+void MSNet_HandleGameList( m_gameinfo* PacketGames, int PacketSize )
+{
+        m_gameinfo TempGameList[64] = {0};
+        int i ;
+        for( i = 0; PacketSize > 0; i++ )
+        {
+                int ThisSize = sizeof(m_gameinfo) + ntohs(PacketGames->len) - sizeof(m_gamedescription);
+                
+                memcpy(TempGameList + i,PacketGames, sizeof(m_gameinfo) - 128);
+
+                sprintf_s( TempGameList[i].g.Buffer, 128, "%s", PacketGames->g.Buffer);
+                PacketSize -= ThisSize;
+                PacketGames = (m_gameinfo*)((char*)PacketGames + ThisSize);
+                
+        }
+        //Do stuff with the games.
+}
+
 int MSNet_Room_Join( short Room, char* Key)
 {
@@ -268 +352 @@
 
         sockaddr_in SockAddr;
-        int Room_Socket = NetTCPSocket_Create(RoomList[Room].Port, &SockAddr);
-
-        sockaddr_in RoomAddr = {0};
         RoomAddr.sin_port = RoomList[Room].Port;
         RoomAddr.sin_family = AF_INET;
         RoomAddr.sin_addr.S_un.S_addr = RoomList[Room].IPAddress;
         
-
+        Room_Socket = NetTCPSocket_Create(RoomList[Room].Port, &SockAddr);
 
         DDrConsole_PrintF("Joining room %hi", Room);
@@ -282 +363 @@
         {
                 DDrConsole_PrintF("Failed to initialize room socket!");
+                return MSNet_Cleanup();
         }
         
@@ -287 +369 @@
         {
                 NetCatchError();
-                return 1;
+                MariusNet_LoggedIn = 0;
+                return MSNet_Cleanup();
         }
         
@@ -306 +389 @@
         if(MariusNet_IncomingPacketWrapper(Room_Socket, incomingData, 1400, 0) == SOCKET_ERROR)
         {
-                return 0;
+                return MSNet_Cleanup();
         }
 
@@ -313 +396 @@
                 //DDrConsole_PrintF("Login failed: %s", incomingPacket->login_denied.DenialMessage );
                 MSNet_LoginError_Output(ntohl(incomingPacket->login_denied.code));
-                return 0;
-        }
-
+                return MSNet_Cleanup();
+        }
+
+        MariusNet_LoggedIn = 1;
+
+        /*
+        Initialize_MPacket(&mPacket, 104);
+        mPacket.newgame.g.maxplayers = -1;
+        mPacket.newgame.g.clientversion = htonl(0xc136e436);
+        mPacket.newgame.g.maxteams = -1;
+        //sprintf(mPacket.newgame.g.Buffer, "Oni!");
+        memcpy(mPacket.newgame.g.Buffer, "Blam!\0This is Oni, bitch.\0", 50);
+        sent_bytes = MariusNet_OutgoingPacketWrapper(Room_Socket, (sockaddr*)&RoomAddr, (char*)&mPacket, 
+                sizeof(marius_header) + sizeof(m_announcegame) + 50);
+        */
         while(1)
         {
@@ -326 +421 @@
                 case pt_RoomList:
                 case pt_PlayerInfo:
-                case pt_GameList:
                 case pt_PlayerList:
                         //Do nothing for now
                         break;
+                case pt_GameList:
+                        MSNet_HandleGameList( incomingPacket->gamelist.Games,  
+                                ntohl(incomingPacket->header.PacketSize) - sizeof(marius_header)); 
+                        break;
                 case pt_BlueBarMsg:
-                        DDrConsole_PrintColored(incomingPacket->motd.Message, 0, blue, grey );
+                        DDrConsole_PrintColored(incomingPacket->motd.Message, 0, cyan, grey );
                         break;
                 case pt_ChatMessage:
+                        MSNet_HandleChat(&incomingPacket->message);
                         break;
                 case pt_KeepAlive:
@@ -351 +450 @@
 {
         int Port = 4156;
-        int Marius_Socket = -1;
-        int PlayerID;
+        
+        
         char RoomToken[33] = {0};
         int i = 0;
-
+        
         
         
         sockaddr_in Marius_Addr = {0};
-        
-        if(Are_We_Logged_In) 
+        if(MsNet_Running)
+        {
+                DDrConsole_PrintF("The metaserver handler is already running!");
+        }
+        MsNet_Running = 1;
+
+        if(MariusNet_LoggedIn) 
         {
                 DDrConsole_PrintF("You're already logged in!");
-                return 0;
+                return MSNet_Cleanup();
         }
 
@@ -371 +475 @@
         if(MariusNet_Initialize())
         {
-                return 0;
+                return MSNet_Cleanup();
         }
 
@@ -398 +502 @@
                 {
                         NetCatchError();
-                        return 0;
+                        return MSNet_Cleanup();
                 }
                 DDrConsole_PrintF("Sending Player Info...");
@@ -412 +516 @@
                 if(MariusNet_IncomingPacketWrapper(Marius_Socket, incomingData, 1400, 0) == SOCKET_ERROR)
                 {
-                        return 0;
+                        return MSNet_Cleanup();
                 }
                 
@@ -450 +554 @@
                         if(!NetUDPSocket_Recieve(Marius_Socket, (sockaddr*)&Marius_Addr,incomingData, &incomingLength))
                         {
-                                return 0;
+                                return MSNet_Cleanup();
                         }
                         DDrConsole_PrintF("Password ACK!");
@@ -465 +569 @@
                                 if(MariusNet_IncomingPacketWrapper(Marius_Socket, incomingData, 1400, 0) == SOCKET_ERROR)
                                 {       
-                                        return 0;
+                                        return MSNet_Cleanup();
                                 }
                         }
@@ -482 +586 @@
                         //DDrConsole_PrintF("Login failed: %s", incomingPacket->login_denied.DenialMessage );
                         MSNet_LoginError_Output(ntohl(incomingPacket->login_denied.code));
-                        return 0;
+                        return MSNet_Cleanup();
                 }
                 else 
                 {
-                        DDrConsole_PrintF("Something went wrong! Disconnecting from Mariusnet");
-                        return 0;
+                        return MSNet_Cleanup();
                 }
 
@@ -495 +598 @@
                         if(MariusNet_IncomingPacketWrapper(Marius_Socket, incomingData, 1400, 0) == SOCKET_ERROR)
                         {       
-                                return 0;
+                                return MSNet_Cleanup();
                         }
                         if(ntohs(incomingPacket->header.PacketId)== pt_RoomList)
@@ -512 +615 @@
                         {
                                 DDrConsole_PrintF("Invalid packet type %hi", ntohs(incomingPacket->header.PacketId));
-                                return 0;
+                                return MSNet_Cleanup();
                         }
                 }

Daodan/MSVC/Mariusnet_Defs.h

@@ -167 +167 @@
 typedef struct
 {
-
-    ColorStuff : TColorInfo;
+        m_colour        PrimaryColor;
+        m_colour        SecondaryColor;
         int    SenderId;
     int         TargetId;
     char Message[256];
-}
-
-
+} m_message;
+
+typedef struct
+{
+        short unknown16;
+        short type;
+        int options;
+        int timelimit;
+        int checksum;
+        short difficulty;
+        short maxplayers;
+        short teamrandomseed;
+        short maxteams; //-1
+        int planningtime;
+        int unusedint;
+        int unusedint_2;
+        short unknown16_2;
+        short pluginflag;
+        char pluginlist[512];
+        int clientversion;//0xc136e436
+        int unknownint;
+        short status;
+        short numplayers;
+        char action;
+        char pad[3];
+        char Buffer[128];
+} m_gamedescription;
+
+typedef struct
+{
+        short port;
+        short zero;
+        m_gamedescription g;
+} m_announcegame;
+
+typedef struct
+{
+        unsigned int    gameID;
+        unsigned int    ipAddress;
+        unsigned short  port;
+        unsigned char   verb;
+        unsigned char   gameEnable;
+        unsigned int    timeRemaining;
+        unsigned int    hostPlayerID;
+        unsigned short  len;
+        int unused1;
+        int unused2;
+        short pad;
+        m_gamedescription g;
+} m_gameinfo;
+
+typedef struct
+{
+        m_gameinfo Games[];
+} m_gamelist;
 typedef struct
 {
@@ -190 +242 @@
                 m_player_info player_info;
                 m_motd motd;
+                m_message message;
+                m_announcegame newgame;
+                m_gamelist gamelist;
         };
 } marius_packet;

Daodan/MSVC/Mariusnet_Public.h

@@ +1 @@
+extern bool MsNet_Running;
+
 bool MSNet_Login(char* username, char* password);
+void MSNet_SendChat( char* msg );