--- a/loudmouth/lm-blocking-resolver.c Tue Jan 13 19:05:15 2009 +0000
+++ b/loudmouth/lm-blocking-resolver.c Tue Jan 13 19:09:54 2009 +0000
@@ -105,11 +105,13 @@
req.ai_socktype = SOCK_STREAM;
req.ai_protocol = IPPROTO_TCP;
+g_print ("blocking_resolver_lookup_host; looking up: %s\n",host);
+
err = getaddrinfo (host, NULL, &req, &ans);
if (err != 0) {
/* FIXME: Report error */
- g_print ("ERROR: %d in %s\n", err, G_STRFUNC);
+ g_print ("blocking_resolver_lookup_host ERROR: %d in %s\n", err, G_STRFUNC);
_lm_resolver_set_result (LM_RESOLVER (resolver), LM_RESOLVER_RESULT_FAILED,
NULL);
@@ -165,6 +167,8 @@
srv = _lm_resolver_create_srv_string (domain, service, protocol);
+g_print ("blocking_resolver_lookup_service: %s\n",srv);
+
res_init ();
len = res_query (srv, C_IN, T_SRV, srv_ans, SRV_LEN);
--- a/loudmouth/lm-data-objects.c Tue Jan 13 19:05:15 2009 +0000
+++ b/loudmouth/lm-data-objects.c Tue Jan 13 19:09:54 2009 +0000
@@ -29,7 +29,7 @@
gchar *username;
gchar *password;
gchar *resource;
-
+
guint ref_count;
};
@@ -37,7 +37,7 @@
gchar *domain;
gchar *host;
guint port;
-
+
guint ref_count;
};
@@ -47,7 +47,7 @@
g_free (params->username);
g_free (params->password);
g_free (params->resource);
-
+
g_slice_free (LmAuthParameters, params);
}
@@ -56,7 +56,7 @@
{
g_free (params->domain);
g_free (params->host);
-
+
g_slice_free (LmConnectParameters, params);
}
@@ -66,17 +66,17 @@
const gchar *resource)
{
LmAuthParameters *params;
-
+
params = g_slice_new0 (LmAuthParameters);
params->username = g_strdup (username);
params->password = g_strdup (password);
-
+
if (resource) {
params->resource = g_strdup (resource);
}
-
+
params->ref_count = 1;
-
+
return params;
}
@@ -84,7 +84,7 @@
lm_auth_parameters_get_username (LmAuthParameters *params)
{
g_return_val_if_fail (params != NULL, NULL);
-
+
return params->username;
}
@@ -92,7 +92,7 @@
lm_auth_parameters_get_password (LmAuthParameters *params)
{
g_return_val_if_fail (params != NULL, NULL);
-
+
return params->password;
}
@@ -100,7 +100,7 @@
lm_auth_parameters_get_resource (LmAuthParameters *params)
{
g_return_val_if_fail (params != NULL, NULL);
-
+
return params->resource;
}
@@ -108,9 +108,9 @@
lm_auth_parameters_ref (LmAuthParameters *params)
{
g_return_val_if_fail (params != NULL, NULL);
-
+
params->ref_count++;
-
+
return params;
}
@@ -118,7 +118,7 @@
lm_auth_parameters_unref (LmAuthParameters *params)
{
g_return_if_fail (params != NULL);
-
+
params->ref_count--;
if (params->ref_count == 0) {
@@ -132,15 +132,15 @@
guint port)
{
LmConnectParameters *params;
-
+
params = g_slice_new0 (LmConnectParameters);
-
+
params->domain = g_strdup (domain);
params->host = g_strdup (host);
params->port = port;
-
+
params->ref_count = 1;
-
+
return params;
}
@@ -148,7 +148,7 @@
lm_connect_parameters_get_domain (LmConnectParameters *params)
{
g_return_val_if_fail (params != NULL, NULL);
-
+
return params->domain;
}
@@ -156,7 +156,7 @@
lm_connect_parameters_get_host (LmConnectParameters *params)
{
g_return_val_if_fail (params != NULL, NULL);
-
+
return params->host;
}
@@ -164,7 +164,7 @@
lm_connect_parameters_get_port (LmConnectParameters *params)
{
g_return_val_if_fail (params != NULL, 0);
-
+
return params->port;
}
@@ -172,9 +172,9 @@
lm_connect_parameters_ref (LmConnectParameters *params)
{
g_return_val_if_fail (params != NULL, NULL);
-
+
params->ref_count++;
-
+
return params;
}
@@ -182,9 +182,9 @@
lm_connect_parameters_unref (LmConnectParameters *params)
{
g_return_if_fail (params != NULL);
-
+
params->ref_count--;
-
+
if (params->ref_count == 0) {
connect_parameters_free (params);
}
--- a/loudmouth/lm-message-node.c Tue Jan 13 19:05:15 2009 +0000
+++ b/loudmouth/lm-message-node.c Tue Jan 13 19:09:54 2009 +0000
@@ -490,12 +490,13 @@
for (child = node->children; child; child = child->next) {
gchar *child_str = lm_message_node_to_string (child);
- g_string_append_c (ret, ' ');
+/* g_string_append_c (ret, ' '); */
g_string_append (ret, child_str);
g_free (child_str);
}
- g_string_append_printf (ret, "</%s>\n", node->name);
+ /* g_string_append_printf (ret, "</%s>\n", node->name); */
+ g_string_append_printf (ret, "</%s>", node->name);
return g_string_free (ret, FALSE);
}