Merge pull request #105 from mtomaschewski/mt-socket

socket: added socket array function variants
openSUSE · Nov 20, 2013 · 4e1e3d8 · 4e1e3d8
2 parents eacff17 + 45296ae
commit 4e1e3d8
Show file tree

Hide file tree

Showing 4 changed files with 232 additions and 66 deletions.
diff --git a/include/wicked/socket.h b/include/wicked/socket.h
@@ -46,8 +46,8 @@ extern int		ni_local_socket_pair(ni_socket_t **, ni_socket_t **);
 extern ni_socket_t *	ni_socket_hold(ni_socket_t *);
 extern void		ni_socket_release(ni_socket_t *);
 extern ni_socket_t *	ni_socket_wrap(int fd, int sotype);
-extern void		ni_socket_activate(ni_socket_t *);
-extern void		ni_socket_deactivate(ni_socket_t *);
+extern ni_bool_t	ni_socket_activate(ni_socket_t *);
+extern ni_bool_t	ni_socket_deactivate(ni_socket_t *);
 extern void		ni_socket_deactivate_all(void);
 extern int		ni_socket_wait(long timeout);
 

diff --git a/include/wicked/types.h b/include/wicked/types.h
@@ -57,6 +57,7 @@ typedef struct ni_dbus_server	ni_dbus_server_t;
 typedef struct ni_dbus_client	ni_dbus_client_t;
 
 typedef struct ni_socket	ni_socket_t;
+typedef struct ni_socket_array	ni_socket_array_t;
 typedef struct ni_buffer	ni_buffer_t;
 typedef struct ni_extension	ni_extension_t;
 typedef struct ni_script_action	ni_script_action_t;