*** empty log message ***

[user/henk/code/inspircd.git] / src / inspircd.cpp

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index a9398c3824c2e4011559d76bb0847480de4e4629..b026723a00eee055ad8704678fc0be4dbb89fb56 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -2833,7 +2833,11 @@ int InspIRCd(char** argv, int argc)
                }
                tvs.tv_usec = 30000L;
                tvs.tv_sec = 0;
+#ifdef IS_SOLARIS
+               int servresult = select(1024, &serverfds, NULL, NULL, &tvs);
+#else
                int servresult = select(32767, &serverfds, NULL, NULL, &tvs);
+#endif
                if (servresult > 0)
                {
                        for (int x = 0; x != SERVERportCount; x++)
@@ -2969,7 +2973,7 @@ int InspIRCd(char** argv, int argc)
                                                        statsDnsBad++;
                                                        FullConnectUser(curr);
                                                         if (fd_ref_table[currfd] != curr) // something changed, bail pronto
-                                                                goto label;
+                                                               goto label;                                                        
                                                }
                                                if ((curr->dns_done) && (curr->registered == 3) && (AllModulesReportReady(curr))) // both NICK and USER... and DNS
                                                {
@@ -3091,14 +3095,21 @@ int InspIRCd(char** argv, int argc)
                                userrec* cu = fd_ref_table[ke.ident];
 #endif
 #ifdef USE_SELECT
+                       tval.tv_sec = 0;
                        tval.tv_usec = 1000L;
+#ifdef IS_SOLARIS
+                       selectResult2 = select(1024, &sfd, NULL, NULL, &tval);
+#else
                        selectResult2 = select(65535, &sfd, NULL, NULL, &tval);
+#endif
                        
                        // now loop through all of the items in this pool if any are waiting
-                       if (selectResult2 > 0)
+                       if ((selectResult2 > 0) && (xcount != clientlist.end()))
                        for (user_hash::iterator count2a = xcount; count2a != endingiter; count2a++)
                        {
                                // SELECT: we have to iterate...
+                               if (count2a == clientlist.end())
+                                       break;
                                userrec* cu = count2a->second;
 #endif
 
@@ -3239,7 +3250,9 @@ int InspIRCd(char** argv, int argc)
 
                                                        }
                                                }
+#ifndef IS_SOLARIS
                                                if ((currfd < 0) || (!fd_ref_table[currfd]))
+#endif
                                                        goto label;
                                        }