service: Check that the supplied nameserver is in numeric format

[framework/connectivity/connman.git] / tools / web-test.c

diff --git a/tools/web-test.c b/tools/web-test.c
index 8a661cf..a507397 100644 (file)
--- a/tools/web-test.c
+++ b/tools/web-test.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -71,6 +71,7 @@ static gboolean web_result(GWebResult *result, gpointer user_data)
 }
 
 static gboolean option_debug = FALSE;
+static gchar *option_proxy = NULL;
 static gchar *option_nameserver = NULL;
 static gchar *option_user_agent = NULL;
 static gchar *option_http_version = NULL;
@@ -78,6 +79,8 @@ static gchar *option_http_version = NULL;
 static GOptionEntry options[] = {
        { "debug", 'd', 0, G_OPTION_ARG_NONE, &option_debug,
                                        "Enable debug output" },
+       { "proxy", 'p', 0, G_OPTION_ARG_STRING, &option_proxy,
+                                       "Specify proxy", "ADDRESS" },
        { "nameserver", 'n', 0, G_OPTION_ARG_STRING, &option_nameserver,
                                        "Specify nameserver", "ADDRESS" },
        { "user-agent", 'A', 0, G_OPTION_ARG_STRING, &option_user_agent,
@@ -125,6 +128,11 @@ int main(int argc, char *argv[])
 
        main_loop = g_main_loop_new(NULL, FALSE);
 
+       if (option_proxy != NULL) {
+               g_web_set_proxy(web, option_proxy);
+               g_free(option_proxy);
+       }
+
        if (option_nameserver != NULL) {
                g_web_add_nameserver(web, option_nameserver);
                g_free(option_nameserver);
@@ -142,7 +150,7 @@ int main(int argc, char *argv[])
 
        timer = g_timer_new();
 
-       if (g_web_request_get(web, argv[1], web_result, NULL) == 0) {
+       if (g_web_request_get(web, argv[1], web_result, NULL,  NULL) == 0) {
                fprintf(stderr, "Failed to start request\n");
                return 1;
        }