… | |
… | |
26 | * Main client/server loops. |
26 | * Main client/server loops. |
27 | * |
27 | * |
28 | * \date 2003-12-02 |
28 | * \date 2003-12-02 |
29 | * |
29 | * |
30 | * loop.c mainly deals with initialization and higher level socket |
30 | * loop.c mainly deals with initialization and higher level socket |
31 | * maintenance (checking for lost connections and if data has arrived.) |
31 | * maintanance (checking for lost connections and if data has arrived.) |
32 | * The reading of data is handled in ericserver.c |
|
|
33 | */ |
32 | */ |
34 | |
33 | |
35 | |
34 | |
36 | #include <global.h> |
35 | #include <global.h> |
37 | #include <sproto.h> |
36 | #include <sproto.h> |
… | |
… | |
70 | { |
69 | { |
71 | //TODO: just disconnect here? |
70 | //TODO: just disconnect here? |
72 | reset_state (); |
71 | reset_state (); |
73 | send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED); |
72 | send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED); |
74 | } |
73 | } |
75 | else if (!cmd_queue.empty () && cmd_queue.front ().stamp + MAX_QUEUE_BACKLOG < stamp) |
|
|
76 | { |
|
|
77 | reset_state (); |
|
|
78 | send_packet_printf ("drawinfo %d too many commands in queue, ignoring.", NDI_RED); |
|
|
79 | } |
|
|
80 | else |
74 | else |
81 | { |
75 | { |
82 | cmd_queue.push_back (command ()); |
76 | cmd_queue.push_back (command ()); |
83 | command &cmd = cmd_queue.back (); |
77 | command &cmd = cmd_queue.back (); |
84 | cmd.stamp = stamp; |
78 | cmd.stamp = stamp; |
85 | cmd.handler = handler; |
79 | cmd.handler = handler; |
86 | cmd.data = (char *)salloc (datalen + 1, data); |
80 | cmd.data = salloc<char> (datalen + 1, data); |
87 | cmd.datalen = datalen; |
81 | cmd.datalen = datalen; |
88 | } |
82 | } |
89 | } |
83 | } |
90 | |
84 | |
91 | bool |
85 | bool |
92 | client::handle_command () |
86 | client::handle_command () |
93 | { |
87 | { |
|
|
88 | bool skipping = false; |
|
|
89 | |
|
|
90 | while (!cmd_queue.empty () |
94 | if (pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0) |
91 | && !(pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0)) |
95 | return false; |
92 | { |
96 | |
|
|
97 | if (cmd_queue.empty ()) |
|
|
98 | return false; |
|
|
99 | |
|
|
100 | command &cmd = cmd_queue.front (); |
93 | command &cmd = cmd_queue.front (); |
101 | |
94 | |
102 | if (cmd.stamp + MAX_QUEUE_BACKLOG < now ()) |
95 | if (cmd.stamp + MAX_QUEUE_BACKLOG < now ()) |
103 | { |
96 | { |
|
|
97 | if (!skipping) |
|
|
98 | { |
|
|
99 | skipping = true; |
104 | reset_state (); |
100 | reset_state (); |
105 | send_packet_printf ("drawinfo %d ignoring delayed command.", NDI_RED); |
101 | send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED); |
106 | } |
102 | } |
|
|
103 | |
|
|
104 | cmd_queue.pop_front (); |
|
|
105 | } |
107 | else |
106 | else |
|
|
107 | { |
108 | execute (cmd.handler, cmd.data, cmd.datalen); |
108 | execute (cmd.handler, cmd.data, cmd.datalen); |
109 | |
|
|
110 | cmd_queue.pop_front (); |
109 | cmd_queue.pop_front (); |
111 | |
|
|
112 | return true; |
110 | return true; |
|
|
111 | } |
|
|
112 | } |
|
|
113 | |
|
|
114 | return false; |
113 | } |
115 | } |
114 | |
116 | |
115 | void |
117 | void |
116 | flush_sockets (void) |
118 | flush_sockets (void) |
117 | { |
119 | { |
… | |
… | |
180 | for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) |
182 | for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) |
181 | { |
183 | { |
182 | client *s = *i; |
184 | client *s = *i; |
183 | player *pl = s->pl; |
185 | player *pl = s->pl; |
184 | |
186 | |
|
|
187 | //TODO: this could probably be nuked completely |
185 | s->handle_packet (); |
188 | s->handle_packet (); |
186 | s->handle_command (); |
189 | s->handle_command (); |
187 | |
190 | |
188 | //TODO: should not be done here, either |
191 | //TODO: should not be done here, either |
189 | if (s->status != Ns_Dead && pl) |
192 | if (s->status != Ns_Dead && pl) |