use enum

[oweals/gnunet.git] / src / util / network.c

diff --git a/src/util/network.c b/src/util/network.c
index 30b2873cb43a98254705b2f1d1eee5ff4ec6190f..031d7a1d7c7de7873f0495add669acf2f1dbbfa5 100644 (file)
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -43,7 +43,7 @@ struct GNUNET_NETWORK_FDSet
   fd_set sds;\r
 #ifdef WINDOWS\r
   /* handles */\r
-  struct GNUNET_CONTAINER_Vector *handles;\r
+  struct GNUNET_CONTAINER_SList *handles;\r
 #endif\r
 };\r
 \r
@@ -416,9 +416,7 @@ GNUNET_NETWORK_fdset_zero (struct GNUNET_NETWORK_FDSet *fds)
   FD_ZERO (&fds->sds);\r
   fds->nsds = 0;\r
 #ifdef MINGW\r
-  if (fds->handles)\r
-    GNUNET_CONTAINER_vector_destroy (fds->handles);\r
-  fds->handles = GNUNET_CONTAINER_vector_create (2);\r
+  GNUNET_CONTAINER_slist_clear (fds->handles);\r
 #endif\r
 }\r
 \r
@@ -486,15 +484,19 @@ GNUNET_NETWORK_fdset_copy (struct GNUNET_NETWORK_FDSet *to,
   FD_COPY (&from->sds, &to->sds);\r
   to->nsds = from->nsds;\r
 #ifdef MINGW\r
-  void *obj;\r
+  struct GNUNET_CONTAINER_SList_Iterator *iter;\r
 \r
-  if (to->handles)\r
-    GNUNET_CONTAINER_vector_destroy (to->handles);\r
-  to->handles = GNUNET_CONTAINER_vector_create (2);\r
-  for (obj = GNUNET_CONTAINER_vector_get_first (from->handles); obj != NULL;\r
-       obj = GNUNET_CONTAINER_vector_get_next (from->handles))\r
+\r
+  GNUNET_CONTAINER_slist_clear (to->handles);\r
+\r
+  for (iter = GNUNET_CONTAINER_slist_begin (from->handles);\r
+      GNUNET_CONTAINER_slist_end (iter) != GNUNET_YES; GNUNET_CONTAINER_slist_next (iter))\r
     {\r
-      GNUNET_CONTAINER_vector_insert_last (to->handles, obj);\r
+      void *handle;\r
+      size_t len;\r
+\r
+      handle = GNUNET_CONTAINER_slist_get (iter, &len);\r
+      GNUNET_CONTAINER_slist_add (to->handles, GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, handle, len);\r
     }\r
 #endif\r
 }\r
@@ -528,7 +530,7 @@ GNUNET_NETWORK_fdset_handle_set (struct GNUNET_NETWORK_FDSet *fds,
   HANDLE hw;\r
 \r
   GNUNET_internal_disk_file_handle (h, &hw, sizeof (HANDLE));\r
-  GNUNET_CONTAINER_vector_insert_last (fds->handles, h);\r
+  GNUNET_CONTAINER_slist_add (fds->handles, GNUNET_NO, &hw, sizeof (HANDLE));\r
 #else\r
   int fd;\r
 \r
@@ -550,8 +552,7 @@ GNUNET_NETWORK_fdset_handle_isset (const struct GNUNET_NETWORK_FDSet *fds,
                                    const struct GNUNET_DISK_FileHandle *h)\r
 {\r
 #ifdef MINGW\r
-  return GNUNET_CONTAINER_vector_index_of (fds->handles, h->h) !=\r
-    (unsigned int) -1;\r
+  return GNUNET_CONTAINER_slist_contains (fds->handles, h->h, sizeof (HANDLE));\r
 #else\r
   return FD_ISSET (h->fd, &fds->sds);\r
 #endif\r
@@ -591,7 +592,7 @@ GNUNET_NETWORK_fdset_create ()
 \r
   fds = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_FDSet));\r
 #ifdef MINGW\r
-  fds->handles = NULL;\r
+  fds->handles = GNUNET_CONTAINER_slist_create ();\r
 #endif\r
   GNUNET_NETWORK_fdset_zero (fds);\r
   return fds;\r
@@ -606,7 +607,7 @@ void
 GNUNET_NETWORK_fdset_destroy (struct GNUNET_NETWORK_FDSet *fds)\r
 {\r
 #ifdef MINGW\r
-  GNUNET_CONTAINER_vector_destroy (fds->handles);\r
+  GNUNET_CONTAINER_slist_destroy (fds->handles);\r
 #endif\r
   GNUNET_free (fds);\r
 }\r
@@ -736,50 +737,76 @@ GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,
 \r
       /* Poll read pipes */\r
       if (rfds)\r
-        for (i = GNUNET_CONTAINER_vector_size (rfds->handles) - 1; i >= 0; i--)\r
-          {\r
-            DWORD dwBytes;\r
-\r
-            if (!PeekNamedPipe\r
-                (GNUNET_CONTAINER_vector_get_at (rfds->handles, i), NULL, 0,\r
-                 NULL, &dwBytes, NULL))\r
-              {\r
-                GNUNET_CONTAINER_vector_remove_at (rfds->handles, i);\r
-\r
-                retcode = -1;\r
-                SetErrnoFromWinError (GetLastError ());\r
+        {\r
+          struct GNUNET_CONTAINER_SList_Iterator *i;\r
+          int on_next;\r
+\r
+          on_next = GNUNET_NO;\r
+          for (i = GNUNET_CONTAINER_slist_begin (rfds->handles);\r
+                    GNUNET_CONTAINER_slist_end (i) != GNUNET_YES;\r
+                    on_next || GNUNET_CONTAINER_slist_next (i))\r
+            {\r
+              HANDLE h;\r
+              DWORD dwBytes;\r
+\r
+              h = *(HANDLE *) GNUNET_CONTAINER_slist_get (i, NULL);\r
+              on_next = GNUNET_NO;\r
+\r
+              if (!PeekNamedPipe (h, NULL, 0, NULL, &dwBytes, NULL))\r
+                {\r
+                  GNUNET_CONTAINER_slist_erase (i);\r
+                  on_next = GNUNET_YES;\r
+\r
+                  retcode = -1;\r
+                  SetErrnoFromWinError (GetLastError ());\r
 #if DEBUG_SOCK\r
-            GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "PeekNamedPipe");\r
+                  GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "PeekNamedPipe");\r
 #endif\r
-               goto select_loop_end;\r
-              }\r
-            else if (dwBytes)\r
-              {\r
-                retcode++;\r
-              }\r
-            else\r
-              GNUNET_CONTAINER_vector_remove_at (rfds->handles, i);\r
-          }\r
+                  goto select_loop_end;\r
+                }\r
+              else if (dwBytes)\r
+                {\r
+                  retcode++;\r
+                }\r
+              else\r
+                {\r
+                  GNUNET_CONTAINER_slist_erase (i);\r
+                  on_next = GNUNET_YES;\r
+                }\r
+            }\r
+        }\r
 \r
       /* Poll for faulty pipes */\r
       if (efds)\r
-        for (i = GNUNET_CONTAINER_vector_size (efds->handles); i >= 0; i--)\r
-          {\r
-            DWORD dwBytes;\r
+        {\r
+          struct GNUNET_CONTAINER_SList_Iterator *i;\r
+          int on_next;\r
+\r
+          on_next = GNUNET_NO;\r
+          for (i = GNUNET_CONTAINER_slist_begin (efds->handles);\r
+                    GNUNET_CONTAINER_slist_end (i) != GNUNET_YES;\r
+                    on_next || GNUNET_CONTAINER_slist_next (i))\r
+            {\r
+              HANDLE h;\r
+              DWORD dwBytes;\r
+\r
+              h = *(HANDLE *) GNUNET_CONTAINER_slist_get (i, NULL);\r
 \r
-            if (PeekNamedPipe\r
-                (GNUNET_CONTAINER_vector_get_at (rfds->handles, i), NULL, 0,\r
-                 NULL, &dwBytes, NULL))\r
-              {\r
-                GNUNET_CONTAINER_vector_remove_at (efds->handles, i);\r
+              if (PeekNamedPipe (h, NULL, 0, NULL, &dwBytes, NULL))\r
+                {\r
+                  GNUNET_CONTAINER_slist_erase (i);\r
+                  on_next = GNUNET_YES;\r
 \r
-                retcode++;\r
-              }\r
-          }\r
+                  retcode++;\r
+                }\r
+              else\r
+                on_next = GNUNET_NO;\r
+            }\r
+        }\r
 \r
       /* FIXME */\r
       if (wfds)\r
-        GNUNET_assert (GNUNET_CONTAINER_vector_size (wfds->handles) == 0);\r
+        GNUNET_assert (GNUNET_CONTAINER_slist_count (wfds->handles) == 0);\r
 \r
       /* Check for closed sockets */\r
       for (i = 0; i < nfds; i++)\r