gweb: Make debug for write simpler

[framework/connectivity/connman.git] / gweb / gweb.c

diff --git a/gweb/gweb.c b/gweb/gweb.c
index 1bb1c70..1183cc6 100644 (file)
--- a/gweb/gweb.c
+++ b/gweb/gweb.c
@@ -429,13 +429,11 @@ static gboolean process_send_buffer(struct web_session *session)
                return FALSE;
        }
 
-       debug(session->web, "bytes to write %zu", count);
-
        status = g_io_channel_write_chars(session->transport_channel,
                                        buf->str, count, &bytes_written, NULL);
 
-       debug(session->web, "status %u bytes written %zu",
-                                       status, bytes_written);
+       debug(session->web, "status %u bytes to write %zu bytes written %zu",
+                                       status, count, bytes_written);
 
        if (status != G_IO_STATUS_NORMAL && status != G_IO_STATUS_AGAIN)
                return FALSE;
@@ -1049,6 +1047,7 @@ static void resolv_result(GResolvResultStatus status,
 {
        struct web_session *session = user_data;
        struct addrinfo hints;
+       char *port;
        int ret;
 
        if (results == NULL || results[0] == NULL) {
@@ -1066,7 +1065,9 @@ static void resolv_result(GResolvResultStatus status,
                session->addr = NULL;
        }
 
-       ret = getaddrinfo(results[0], NULL, &hints, &session->addr);
+       port = g_strdup_printf("%u", session->port);
+       ret = getaddrinfo(results[0], port, &hints, &session->addr);
+       g_free(port);
        if (ret != 0 || session->addr == NULL) {
                call_result_func(session, 400);
                return;
@@ -1145,9 +1146,30 @@ static guint do_request(GWeb *web, const char *url,
                        return 0;
                }
        } else {
+               struct addrinfo hints;
+               char *port;
+               int ret;
+
                if (session->address == NULL)
                        session->address = g_strdup(session->host);
 
+               memset(&hints, 0, sizeof(struct addrinfo));
+               hints.ai_flags = AI_NUMERICHOST;
+
+               if (session->addr != NULL) {
+                       freeaddrinfo(session->addr);
+                       session->addr = NULL;
+               }
+
+               port = g_strdup_printf("%u", session->port);
+               ret = getaddrinfo(session->address, port, &hints,
+                                                       &session->addr);
+               g_free(port);
+               if (ret != 0 || session->addr == NULL) {
+                       free_session(session);
+                       return 0;
+               }
+
                if (create_transport(session) < 0) {
                        free_session(session);
                        return 0;