Revision 939
added passing of overhead camera image to client through PHP
fixed unfreed memory in server/vision/savetonetwork.c
| ColonetServer.cpp | ||
|---|---|---|
| 66 | 66 |
|
| 67 | 67 |
if (initialize_wireless() < 0) {
|
| 68 | 68 |
fprintf(stderr, "%s: initWireless failed\n", __FUNCTION__); |
| 69 |
return -1; |
|
| 69 |
//TODO: Can we continue safely without wireless? |
|
| 70 |
//return -1; |
|
| 70 | 71 |
} |
| 71 | 72 |
|
| 72 | 73 |
return 0; |
| ... | ... | |
| 111 | 112 |
return 0; |
| 112 | 113 |
} |
| 113 | 114 |
|
| 115 |
/** |
|
| 116 |
* @brief The function that is run in the new pthread in order to do the client processing |
|
| 117 |
*/ |
|
| 114 | 118 |
void ColonetServer::loop_server() {
|
| 115 | 119 |
//add the socket that you will listen to connections on to the connection pool |
| 116 | 120 |
connection_pool->add_new_socket_to_pool(listen_socket); |
| ... | ... | |
| 178 | 182 |
} |
| 179 | 183 |
} |
| 180 | 184 |
|
| 185 |
/** |
|
| 186 |
* @brief Launchpad function to start loop_server() since callbacks don't support member functions |
|
| 187 |
* |
|
| 188 |
* @param arg the argument to give to the new thread |
|
| 189 |
*/ |
|
| 181 | 190 |
void * launch_loop_server(void *arg) {
|
| 182 | 191 |
ColonetServer *object = (ColonetServer*) arg; |
| 183 | 192 |
object->loop_server(); |
| ... | ... | |
| 195 | 204 |
return 0; |
| 196 | 205 |
} |
| 197 | 206 |
|
| 207 |
/** |
|
| 208 |
* @brief Main loop of the server, runs periodic tasks |
|
| 209 |
* |
|
| 210 |
* @return 0 on success, negative error code on failure |
|
| 211 |
*/ |
|
| 198 | 212 |
int ColonetServer::run_loop() {
|
| 199 | 213 |
|
| 200 | 214 |
int refresh_virtual_wall_count = 0; |
Also available in: Unified diff