Changeset 538

Timestamp:

02/22/10 22:37:05 (5 months ago)

Author:

gaul@…

Message:

• NASTY async socket bug resolved
  

Location:

branches/cpp-ode/src

Files:

• libmmpong/netcon.h (modified) (10 diffs)
• libmmpong/netgame.h (modified) (1 diff)
• libmmpong/netgame_ode_pong.cc (modified) (1 diff)
• libmmpong/netgame_ode_pong.h (modified) (4 diffs)
• mmpong-gl/client_gl.cc (modified) (2 diffs)
• mmpong-gl/hid.h (added)
• mmpong-gl/netgame_ode_pong_gl.h (modified) (2 diffs)
• mmpongd/server.cc (modified) (1 diff)

branches/cpp-ode/src/libmmpong/netcon.h

@@ -23 +23 @@
                 void write(NetMsg::pointer msg) {
                         LOGDBG("enter");
-                        skt_.get_io_service().post(boost::bind(&NetCon::do_write, this, msg));
+                        skt_.get_io_service().post(boost::bind(&NetCon::do_write, shared_from_this(), msg));
                 };
 
@@ -33 +33 @@
 
                 void stop() {
+                        LOGDBG("enter");
+                        closed=true;
                         skt_.close();
                 };
@@ -39 +41 @@
                         return skt_;
                 };
+
+                ~NetCon() {
+                        LOGDBG("destroy NetCon");
+                }
         private:
                 explicit NetCon(boost::asio::io_service &svc, boost::function<void(pointer)> onError,   boost::function<void(pointer, NetMsg::pointer)> onRead) : skt_(svc), onRead_(onRead), onError_(onError) {
                         rbuf = NetMsg::create();
+                        closed=false;
                 };
 
@@ -48 +55 @@
                                         skt_,
                                         rbuf->recv_hdr(),
-                                        boost::bind(&NetCon::handle_read_hdr, this, boost::asio::placeholders::error)
+                                        boost::bind(&NetCon::handle_read_hdr, shared_from_this(), boost::asio::placeholders::error)
                                 );
                 };
@@ -57 +64 @@
                                 read_body();
                         } else {
-                                do_close();
                                 LOGDBG("read operation failed.");
-                                onError_(shared_from_this());
+                                if (!closed) {
+                                        stop();
+                                        onError_(shared_from_this());
+                                }
                         }
                 };
@@ -67 +76 @@
                                         skt_,
                                         rbuf->recv_body(),
-                                        boost::bind(&NetCon::handle_read_body, this, boost::asio::placeholders::error)
+                                        boost::bind(&NetCon::handle_read_body, shared_from_this(), boost::asio::placeholders::error)
                                 );
                 };
@@ -75 +84 @@
                         if (!err) {
                                 rbuf->recv_finish();
-                                onRead_(shared_from_this(), rbuf);
+                                //onRead_(shared_from_this(), rbuf);
+                                skt_.get_io_service().post(boost::bind(onRead_, shared_from_this(), rbuf));
+                                //onRead_(shared_from_this(), rbuf);
 
+                                LOGDBG("read next one");
                                 //read next one
                                 rbuf = NetMsg::create();
                                 read_hdr();
                         } else {
-                                do_close();
-                                LOGDBG("read operation failed.");
-                                onError_(shared_from_this());
+                                LOGDBG("read operation failed." << err);
+                                if (!closed) {
+                                        stop();
+                                        onError_(shared_from_this());
+                                }
                         }
                 };
@@ -95 +109 @@
                                                 skt_, 
                                                 msg->send(),
-                                                boost::bind(&NetCon::handle_write, this, boost::asio::placeholders::error)
+                                                boost::bind(&NetCon::handle_write, shared_from_this(), boost::asio::placeholders::error)
                                         );
                         }
@@ -108 +122 @@
                                                         skt_, 
                                                         wq.front()->send(),
-                                                        boost::bind(&NetCon::handle_write, this, boost::asio::placeholders::error)
+                                                        boost::bind(&NetCon::handle_write, shared_from_this(), boost::asio::placeholders::error)
                                                 );
                                 }
                         }       else {
-                                do_close();
-                                LOGDBG("write operation failed.");
-                                onError_(shared_from_this());
+                                LOGDBG("write operation failed." << err);
+                                if (!closed) {
+                                        stop();
+                                        onError_(shared_from_this());
+                                }
                         }
-                };
-
-                void do_close() {
-                        skt_.close();
                 };
 
@@ -127 +139 @@
                 std::deque<NetMsg::pointer> wq; //write queue
                 NetMsg::pointer rbuf; //read buffer
+                bool closed;
 };
 

branches/cpp-ode/src/libmmpong/netgame.h

@@ -113 +113 @@
                 const std::map<uint16_t, NetEnt::pointer>& get_ents() { return ents; };
                 NetEnt::pointer get_ent(uint16_t entid) { return ents[entid]; };
+                template <class CLASS> boost::shared_ptr<CLASS> get_ent(uint16_t entid) {
+                        return boost::dynamic_pointer_cast<CLASS>(get_ent(entid));
+                };
 
                 //only server creates NetEnts

branches/cpp-ode/src/libmmpong/netgame_ode_pong.cc

@@ -263 +263 @@
 };
 
+void NetGameODEPong::cln_set_paddlepos(float pos) {
+        if (pos>1.0)
+                pos=1.0;
+        if (pos<0.0)
+                pos=0.0;
+        if (pos!=mypadpos) {
+                mypadpos=pos;
+                boost::shared_ptr<ODEBox> pad=get_ent<ODEBox>(mypadid);
+                double ang=M_PI*(1.0+2.0*myteamid/srv_teamid_cur);
+                pad->setPosition(cos(ang)*1.05, -1.0 + 2.0 * mypadpos, 0.0);
+                NetMsg::pointer msg=NetMsg::create(NetMsg::CmdGameCustom);
+                msg->pack_begin();
+                uint16_t customcmd=PlayerPadPos;
+                msg->pack(customcmd);
+                msg->pack(mypadpos);
+                msg->pack_finish();
+                cln_con->write(msg);
+        }
+};
+
 void NetGameODEPong::print_playerlist() {
         for (std::map<uint16_t, std::set<uint16_t> >::iterator itteam=team2players.begin(); itteam!=team2players.end(); itteam++) {

branches/cpp-ode/src/libmmpong/netgame_ode_pong.h

@@ -29 +29 @@
                         team2players[srv_teamid_cur++]=std::set<uint16_t>();
                         
+                        mypadpos=0.5;
+                        
                         //ATTENTION: do not perform server-specific actions here
                         //           => use srv_init() instead
@@ -37 +39 @@
                         PlayerId,
                         PlayerLeave,
+                        PlayerPadPos
                 } CmdCustom;
                 
@@ -42 +45 @@
                 virtual NetEnt::pointer cln_ent_update(NetMsg::pointer msg);
                 virtual void cln_msg_custom(NetMsg::pointer msg);
+                void cln_set_paddlepos(float pos); //0.0 <= pos <= 1.0
 
                 //server
@@ -75 +79 @@
                 //client stuff
                 uint16_t myplayerid, myteamid, mypadid;
+                float mypadpos;
 };
 

branches/cpp-ode/src/mmpong-gl/client_gl.cc

@@ -1 +1 @@
 #include "client_gl.h"
+#include "hid.h"
 
 using namespace mmp;
@@ -101 +102 @@
                         renderer.change_view(mouse_x*CAM_SPEED, mouse_y*CAM_SPEED);
                 }
-                else if (mouse_x != 0 || mouse_y != 0) {
-                        //paddle control here!
+                else {
+                        boost::shared_ptr<HID> hid=boost::dynamic_pointer_cast<HID>(game);
+                        if (hid)
+                                hid->process(renderer, key_state, mouse_state, mouse_x, mouse_y);
                 }
 

branches/cpp-ode/src/mmpong-gl/netgame_ode_pong_gl.h

@@ -6 +6 @@
 #include "ode_box_gl.h"
 #include "ode_sphere_gl.h"
+#include "hid.h"
 
 namespace mmp {
 
-class NetGameODEPongGL : public NetGameODEPong {
+class NetGameODEPongGL : public NetGameODEPong, public HID {
         public:
                 static pointer create(NetCon::pointer cln_con_, const std::string& _playername, const std::string& _resdir) {
@@ -35 +36 @@
                         
                 };
+                
+                virtual void process(Renderer& renderer, uint8_t *key_state, uint32_t mouse_state, int mouse_x, int mouse_y) { 
+                        if (mouse_x != 0 || mouse_y != 0) {
+                                cln_set_paddlepos(mypadpos + (1.0/100)*mouse_y);
+                                
+                        }
+                };
         private:
                 std::string playername;

branches/cpp-ode/src/mmpongd/server.cc

@@ -87 +87 @@
                                 bool result=game->srv_msg_process(con, msg);
                                 if (!result) {
-                                        LOG("Kicking client")
+                                        LOGDBG("Kicking client")
                                         game->srv_con_end(con);
                                         game->srv_con_remove(con);
+                                        man_.stop(con);
                                 }
                         }