[Supertuxkart-commit] SF.net SVN: supertuxkart:[9249] main/branches/networking/src

[<com...@us...>]

Revision: 9249
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=9249&view=rev
Author:   computerfreak97
Date:     2011-07-13 14:45:04 +0000 (Wed, 13 Jul 2011)

Log Message:
-----------
Added debug info to networking branch

Modified Paths:
--------------
    main/branches/networking/src/main_loop.cpp
    main/branches/networking/src/network/network_manager.cpp

Modified: main/branches/networking/src/main_loop.cpp
===================================================================
--- main/branches/networking/src/main_loop.cpp	2011-07-13 01:45:30 UTC (rev 9248)
+++ main/branches/networking/src/main_loop.cpp	2011-07-13 14:45:04 UTC (rev 9249)
@@ -127,6 +127,13 @@
 
         network_manager->update(dt);
 
+        printf("Num Clients: %i\n",network_manager->getNumClients());
+		
+		if (network_manager->getNumClients() == 1) {
+            printf("beginRSG in main\n");
+            network_manager->beginReadySetGoBarrier();
+		}
+
         if (World::getWorld())  // race is active if world exists
         {
             // Busy wait if race_manager is active (i.e. creating of world is done)

Modified: main/branches/networking/src/network/network_manager.cpp
===================================================================
--- main/branches/networking/src/network/network_manager.cpp	2011-07-13 01:45:30 UTC (rev 9248)
+++ main/branches/networking/src/network/network_manager.cpp	2011-07-13 14:45:04 UTC (rev 9249)
@@ -76,11 +76,12 @@
 // -----------------------------------------------------------------------------
 bool NetworkManager::initServer()
 {
-     ENetAddress address;
-     address.host = ENET_HOST_ANY;
-     address.port = UserConfigParams::m_server_port;
+    printf("initServer\n");
+    ENetAddress address;
+    address.host = ENET_HOST_ANY;
+    address.port = UserConfigParams::m_server_port;
 
-     m_host = enet_host_create (& address     /* the address to bind the server host to */, 
+    m_host = enet_host_create (& address     /* the address to bind the server host to */, 
                                 stk_config->m_max_karts /* number of connections */,
                                 0             /* channel limit */,
                                 0             /* incoming bandwidth */,
@@ -106,6 +107,8 @@
  */
 bool NetworkManager::initClient()
 {
+    printf("initClient\n");
+    printf("Client attempting to connect to: %s:%d\n", UserConfigParams::m_server_address.c_str(), (int)UserConfigParams::m_server_port);
     m_host = enet_host_create (NULL /* create a client host */,
                                1    /* only allow 1 outgoing connection */,
                                0    /* channel limit */,
@@ -151,6 +154,7 @@
     }
     m_server = peer;
     return true;
+    printf("Connection succeed!\n");
 }  // initClient
 
 // ----------------------------------------------------------------------------
@@ -179,6 +183,7 @@
 */
 void NetworkManager::disableNetworking()
 {
+    printf("Networking Disabled!\n");
     m_mode=NW_NONE;
     if (m_host != NULL)
     {
@@ -192,6 +197,7 @@
 // ----------------------------------------------------------------------------
 void NetworkManager::handleNewConnection(ENetEvent *event)
 {
+    printf("New connection! m_state %s connections!\n", (m_state==NS_ACCEPT_CONNECTIONS) ? "accepting" : "not accepting");
     // Only accept while waiting for connections
     if(m_state!=NS_ACCEPT_CONNECTIONS) return;
 
@@ -226,9 +232,11 @@
     {
     case NS_ACCEPT_CONNECTIONS:
         {
+            printf("NS_ACCEPT_CONNECTIONS (handleMsgAtServer)!\n");
             ConnectMessage m(event->packet);
             m_client_names[(int)(long)event->peer->data] = m.getId();
             m_num_clients++;
+            printf("m_num_clients: %i\n",m_num_clients);
             return;
         }
     case NS_KART_CONFIRMED:    // Fall through
@@ -275,6 +283,7 @@
         }
     case NS_READY_SET_GO_BARRIER:
         {
+            printf("NS_R_S_G_BARRIER (handleMsgAtServer)\n");
             m_barrier_count ++;
             if(m_barrier_count==(int)m_num_clients)
             {
@@ -311,6 +320,7 @@
     {
     case NS_WAIT_FOR_AVAILABLE_CHARACTERS:
         {
+            printf("Waiting for available characters (handleMsgAtClient)\n");
             CharacterInfoMessage m(event->packet);
             // FIXME: handle list of available characters
             m_state = NS_CHARACTER_SELECT;
@@ -318,6 +328,7 @@
         }
     case NS_CHARACTER_SELECT:  
         {
+            printf("Character Select (handleMsgAtClient)\n");
             CharacterConfirmMessage m(event->packet);
             kart_properties_manager->selectKartName(m.getKartName());
             // TODO - karts selection screen in networking
@@ -330,6 +341,7 @@
         }
     case NS_WAIT_FOR_KART_CONFIRMATION:
         {
+            printf("Wait for Kart Conf (handleMsgAtClient)\n");
             CharacterConfirmMessage m(event->packet);
             kart_properties_manager->selectKartName(m.getKartName());
 
@@ -433,6 +445,7 @@
 // ----------------------------------------------------------------------------
 void NetworkManager::broadcastToClients(Message &m)
 {
+    printf("broadcastToClients\n");
     enet_host_broadcast(m_host, 0, m.getPacket());
     enet_host_flush(m_host); 
 }   // broadcastToClients
@@ -440,6 +453,7 @@
 // ----------------------------------------------------------------------------
 void NetworkManager::sendToServer(Message &m)
 {
+    printf("sendToServer");
     enet_peer_send(m_server, 0, m.getPacket());
     enet_host_flush(m_host); 
 }   // sendToServer


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.