*** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1012 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2007-05-19 07:11:09 +00:00
parent eac1c20d16
commit 43fd1b8711
8 changed files with 150 additions and 46 deletions
@@ -190,6 +190,86 @@ bool resolverwait(const char *name, ENetAddress *address)
    return resolved;
 }

+SDL_Thread *connthread = NULL;
+SDL_mutex *connmutex = NULL;
+SDL_cond *conncond = NULL;
+
+struct connectdata
+{
+    ENetSocket sock;
+    ENetAddress address;
+    int result;
+};
+
+// do this in a thread to prevent timeouts
+// could set timeouts on sockets, but this is more reliable and gives more control
+int connectthread(void *data)
+{
+    SDL_LockMutex(connmutex);
+    if(!connthread || SDL_GetThreadID(connthread) != SDL_ThreadID())
+    {
+        SDL_UnlockMutex(connmutex);
+        return 0;
+    }
+    connectdata cd = *(connectdata *)data;
+    SDL_UnlockMutex(connmutex);
+
+    int result = enet_socket_connect(cd.sock, &cd.address);
+
+    SDL_LockMutex(connmutex);
+    if(!connthread || SDL_GetThreadID(connthread) != SDL_ThreadID())
+    {
+        enet_socket_destroy(cd.sock);
+        SDL_UnlockMutex(connmutex);
+        return 0;
+    }
+    ((connectdata *)data)->result = result;
+    SDL_CondSignal(conncond);
+    SDL_UnlockMutex(connmutex);
+
+    return 0;
+}
+
+#define CONNLIMIT 20000
+
+int connectwithtimeout(ENetSocket sock, char *hostname, ENetAddress &address)
+{   
+    s_sprintfd(text)("connecting to %s... (esc to abort)", hostname);
+    show_out_of_renderloop_progress(0, text);
+
+    if(!connmutex) connmutex = SDL_CreateMutex();
+    if(!conncond) conncond = SDL_CreateCond();
+    SDL_LockMutex(connmutex);
+    connectdata cd = { sock, address, -1 };
+    connthread = SDL_CreateThread(connectthread, &cd);
+
+    int starttime = SDL_GetTicks(), timeout = 0;
+    for(;;)
+    {
+        if(!SDL_CondWaitTimeout(conncond, connmutex, 250))
+        {
+            if(cd.result<0) enet_socket_destroy(sock);
+            break;
+        }       
+        timeout = SDL_GetTicks() - starttime;
+        show_out_of_renderloop_progress(min(float(timeout)/CONNLIMIT, 1), text);
+        SDL_Event event;
+        while(SDL_PollEvent(&event))
+        {
+            if(event.type == SDL_KEYDOWN && event.key.keysym.sym == SDLK_ESCAPE) timeout = CONNLIMIT + 1;
+        }
+        if(timeout > CONNLIMIT) break;
+    }
+
+    /* thread will actually timeout eventually if its still trying to connect
+     * so just leave it (and let it destroy socket) instead of causing problems on some platforms by killing it 
+     */
+    connthread = NULL;
+    SDL_UnlockMutex(connmutex);
+
+    return cd.result;
+}
+
 struct serverinfo
 {
    char *name;
@@ -358,9 +438,8 @@ void refreshservers(void *menu, bool init)

 void updatefrommaster()
 {
-    const int MAXUPD = 32000;
-    uchar buf[MAXUPD];
-    uchar *reply = retrieveservers(buf, MAXUPD);
+    uchar buf[32000];
+    uchar *reply = retrieveservers(buf, sizeof(buf));
    if(!*reply || strstr((char *)reply, "<html>") || strstr((char *)reply, "<HTML>")) conoutf("master server not replying");
    else 
    {