nl: Connect the socket ourselves when we create it

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
sardemff7 · May 26, 2016 · 173f2f5 · 173f2f5
1 parent 67cb7b3
commit 173f2f5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/nl/libgwater-nl.c b/nl/libgwater-nl.c
@@ -129,7 +129,7 @@ g_water_nl_source_new_cache_mngr(GMainContext *context, gint protocol, gint flag
 }
 
 GWaterNlSource *
-g_water_nl_source_new_sock(GMainContext *context)
+g_water_nl_source_new_sock(GMainContext *context, gint protocol)
 {
     struct nl_sock *sock;
     GWaterNlSource *self;
@@ -139,6 +139,12 @@ g_water_nl_source_new_sock(GMainContext *context)
     if ( sock == NULL )
         return NULL;
 
+    if ( nl_connect(sock, protocol) < 0 )
+    {
+        nl_socket_free(sock);
+        return NULL;
+    }
+
     self = g_water_nl_source_new_for_sock(context, sock);
     self->owned = TRUE;
 

diff --git a/nl/libgwater-nl.h b/nl/libgwater-nl.h
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
 typedef struct _GWaterNlSource GWaterNlSource;
 
 GWaterNlSource *g_water_nl_source_new_cache_mngr(GMainContext *context, gint protocol, gint flags, gint *error);
-GWaterNlSource *g_water_nl_source_new_sock(GMainContext *context);
+GWaterNlSource *g_water_nl_source_new_sock(GMainContext *context, gint protocol);
 GWaterNlSource *g_water_nl_source_new_for_cache_mngr(GMainContext *context, struct nl_cache_mngr *cache_mngr);
 GWaterNlSource *g_water_nl_source_new_for_sock(GMainContext *context, struct nl_sock *sock);
 void g_water_nl_source_free(GWaterNlSource *self);