Create connect_data in LmOldSocket, revert a segfault when working on LmResolver.
authorMikael Hallendal <micke@imendio.com>
Mon, 06 Oct 2008 02:09:58 +0200
changeset 502 4b69fbfa8797
parent 501 5f71592beac8
child 503 c7c1722ec2db
Create connect_data in LmOldSocket, revert a segfault when working on LmResolver. Was a bit agressive when removing old code as I was putting the LmResolver code in place.
loudmouth/lm-old-socket.c
--- a/loudmouth/lm-old-socket.c	Mon Oct 06 01:41:19 2008 +0200
+++ b/loudmouth/lm-old-socket.c	Mon Oct 06 02:09:58 2008 +0200
@@ -800,7 +800,7 @@
                       "host", remote_addr, 
                       "type", LM_RESOLVER_HOST,
                       NULL);
-
+       
         lm_resolver_lookup (resolver);
 }
 
@@ -823,7 +823,7 @@
 
                 return;
         }
-        
+
         socket->connect_data->current_addr = 
                 lm_resolver_results_get_next (resolver);
 
@@ -845,7 +845,8 @@
                       LmProxy           *proxy,
                       GError           **error)
 {
-        LmOldSocket  *socket;
+        LmOldSocket   *socket;
+        LmConnectData *data;
 
 	g_return_val_if_fail (domain != NULL, NULL);
 	g_return_val_if_fail ((port >= LM_MIN_PORT && port <= LM_MAX_PORT), NULL);
@@ -875,6 +876,12 @@
 		socket->proxy = lm_proxy_ref (proxy);
 	}
 
+        data = g_new0 (LmConnectData, 1);
+        data->socket = socket;
+        data->connection = socket->connection;
+        data->fd = -1;
+        socket->connect_data = data;
+
 	if (!server) {
                 socket->resolver = lm_resolver_new_for_service (socket->domain,
                                                                 "xmpp-client",