projects
/
platform
/
upstream
/
connman.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Update settings when device information in device_list is changed" into tizen
[platform/upstream/connman.git]
/
tools
/
web-test.c
diff --git
a/tools/web-test.c
b/tools/web-test.c
old mode 100644
(file)
new mode 100755
(executable)
index
58ff131
..
55c58af
--- a/
tools/web-test.c
+++ b/
tools/web-test.c
@@
-2,7
+2,7
@@
*
* Connection Manager
*
*
* Connection Manager
*
- * Copyright (C) 2007-201
0
Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-201
2
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
*
* 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
@@
-43,32
+43,50
@@
static void sig_term(int sig)
g_main_loop_quit(main_loop);
}
g_main_loop_quit(main_loop);
}
-static
gboolean
web_result(GWebResult *result, gpointer user_data)
+static
bool
web_result(GWebResult *result, gpointer user_data)
{
{
+ const guint8 *chunk;
+ gsize length;
guint16 status;
gdouble elapsed;
guint16 status;
gdouble elapsed;
+ g_web_result_get_chunk(result, &chunk, &length);
+
+ if (length > 0) {
+ printf("%s\n", (char *) chunk);
+ return true;
+ }
+
status = g_web_result_get_status(result);
status = g_web_result_get_status(result);
+ g_print("status: %03u\n", status);
+
elapsed = g_timer_elapsed(timer, NULL);
g_print("elapse: %f seconds\n", elapsed);
elapsed = g_timer_elapsed(timer, NULL);
g_print("elapse: %f seconds\n", elapsed);
- g_print("status: %03u\n", status);
-
g_main_loop_quit(main_loop);
g_main_loop_quit(main_loop);
- return
FALSE
;
+ return
false
;
}
}
-static gboolean option_debug = FALSE;
+static bool option_debug = false;
+static gchar *option_proxy = NULL;
static gchar *option_nameserver = NULL;
static gchar *option_nameserver = NULL;
+static gchar *option_user_agent = NULL;
+static gchar *option_http_version = NULL;
static GOptionEntry options[] = {
{ "debug", 'd', 0, G_OPTION_ARG_NONE, &option_debug,
"Enable debug output" },
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" },
{ "nameserver", 'n', 0, G_OPTION_ARG_STRING, &option_nameserver,
"Specify nameserver", "ADDRESS" },
+ { "user-agent", 'A', 0, G_OPTION_ARG_STRING, &option_user_agent,
+ "Specific user agent", "STRING" },
+ { "http-version", 'H', 0, G_OPTION_ARG_STRING, &option_http_version,
+ "Specific HTTP version", "STRING" },
{ NULL },
};
{ NULL },
};
@@
-83,8
+101,8
@@
int main(int argc, char *argv[])
context = g_option_context_new(NULL);
g_option_context_add_main_entries(context, options, NULL);
context = g_option_context_new(NULL);
g_option_context_add_main_entries(context, options, NULL);
- if (
g_option_context_parse(context, &argc, &argv, &error) == FALSE
) {
- if (error
!= NULL
) {
+ if (
!g_option_context_parse(context, &argc, &argv, &error)
) {
+ if (error) {
g_printerr("%s\n", error->message);
g_error_free(error);
} else
g_printerr("%s\n", error->message);
g_error_free(error);
} else
@@
-100,26
+118,39
@@
int main(int argc, char *argv[])
}
web = g_web_new(index);
}
web = g_web_new(index);
- if (
web == NULL
) {
+ if (
!web
) {
fprintf(stderr, "Failed to create web service\n");
return 1;
}
fprintf(stderr, "Failed to create web service\n");
return 1;
}
- if (option_debug
== TRUE
)
+ if (option_debug)
g_web_set_debug(web, web_debug, "WEB");
main_loop = g_main_loop_new(NULL, FALSE);
g_web_set_debug(web, web_debug, "WEB");
main_loop = g_main_loop_new(NULL, FALSE);
- if (option_nameserver != NULL) {
+ if (option_proxy) {
+ g_web_set_proxy(web, option_proxy);
+ g_free(option_proxy);
+ }
+
+ if (option_nameserver) {
g_web_add_nameserver(web, option_nameserver);
g_free(option_nameserver);
}
g_web_add_nameserver(web, option_nameserver);
g_free(option_nameserver);
}
- g_web_set_user_agent(web, "ConnMan/%s", VERSION);
+ if (option_user_agent) {
+ g_web_set_user_agent(web, "%s", option_user_agent);
+ g_free(option_user_agent);
+ }
+
+ if (option_http_version) {
+ g_web_set_http_version(web, option_http_version);
+ g_free(option_http_version);
+ }
timer = g_timer_new();
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;
}
fprintf(stderr, "Failed to start request\n");
return 1;
}