]> git.sesse.net Git - cubemap/commitdiff
Some fixes to issues that could cause client hangs.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 7 Apr 2013 19:10:20 +0000 (21:10 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 7 Apr 2013 19:10:20 +0000 (21:10 +0200)
server.cpp

index 855e21c9767587fba2590fccadb47cdb5de852c5..54e6b5e804d9959632b1ef70df6a53fee7f52fac 100644 (file)
@@ -231,6 +231,8 @@ void Server::add_client_from_serialized(const ClientProto &client)
                perror("epoll_ctl(EPOLL_CTL_ADD)");
                exit(1);
        }
+
+       process_client(&clients[client.sock()]);
 }
 
 void Server::add_stream(const string &stream_id)
@@ -488,7 +490,7 @@ int Server::parse_request(Client *client)
        }
 
        client->stream_id = request_tokens[1];
-       client->stream = streams[client->stream_id];
+       client->stream = find_stream(client->stream_id);
        client->request.clear();
 
        return 200;  // OK!