projects
/
framework
/
connectivity
/
connman.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change service name from org.moblin.connman to net.connman
[framework/connectivity/connman.git]
/
tools
/
web-test.c
diff --git
a/tools/web-test.c
b/tools/web-test.c
index
1e211d5
..
8a661cf
100644
(file)
--- a/
tools/web-test.c
+++ b/
tools/web-test.c
@@
-24,7
+24,6
@@
#endif
#include <stdio.h>
#endif
#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#include <signal.h>
#include <string.h>
#include <signal.h>
@@
-44,27
+43,47
@@
static void sig_term(int sig)
g_main_loop_quit(main_loop);
}
g_main_loop_quit(main_loop);
}
-static
void web_result(uint16_t status
, gpointer user_data)
+static
gboolean web_result(GWebResult *result
, gpointer user_data)
{
{
+ const guint8 *chunk;
+ gsize length;
+ guint16 status;
gdouble elapsed;
gdouble elapsed;
-
elapsed = g_timer_elapsed(timer, NULL
);
+
g_web_result_get_chunk(result, &chunk, &length
);
- g_print("elapse: %f seconds\n", elapsed);
+ if (length > 0) {
+ printf("%s\n", (char *) chunk);
+ return TRUE;
+ }
+
+ status = g_web_result_get_status(result);
g_print("status: %03u\n", status);
g_print("status: %03u\n", status);
+ elapsed = g_timer_elapsed(timer, NULL);
+
+ g_print("elapse: %f seconds\n", elapsed);
+
g_main_loop_quit(main_loop);
g_main_loop_quit(main_loop);
+
+ return FALSE;
}
static gboolean option_debug = FALSE;
static gchar *option_nameserver = NULL;
}
static gboolean option_debug = FALSE;
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" },
{ "nameserver", 'n', 0, G_OPTION_ARG_STRING, &option_nameserver,
"Specify nameserver", "ADDRESS" },
static GOptionEntry options[] = {
{ "debug", 'd', 0, G_OPTION_ARG_NONE, &option_debug,
"Enable debug output" },
{ "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 },
};
@@
-85,19
+104,19
@@
int main(int argc, char *argv[])
g_error_free(error);
} else
g_printerr("An unknown error occurred\n");
g_error_free(error);
} else
g_printerr("An unknown error occurred\n");
-
exit(1)
;
+
return 1
;
}
g_option_context_free(context);
if (argc < 2) {
}
g_option_context_free(context);
if (argc < 2) {
-
printf("m
issing argument\n");
+
fprintf(stderr, "M
issing argument\n");
return 1;
}
web = g_web_new(index);
if (web == NULL) {
return 1;
}
web = g_web_new(index);
if (web == NULL) {
-
printf("failed to
web service\n");
+
fprintf(stderr, "Failed to create
web service\n");
return 1;
}
return 1;
}
@@
-109,14
+128,22
@@
int main(int argc, char *argv[])
if (option_nameserver != NULL) {
g_web_add_nameserver(web, option_nameserver);
g_free(option_nameserver);
if (option_nameserver != NULL) {
g_web_add_nameserver(web, option_nameserver);
g_free(option_nameserver);
- } else
- g_web_add_nameserver(web, "127.0.0.1");
+ }
+
+ if (option_user_agent != NULL) {
+ g_web_set_user_agent(web, "%s", option_user_agent);
+ g_free(option_user_agent);
+ }
+
+ if (option_http_version != NULL) {
+ 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(web, G_WEB_METHOD_GET, argv[1],
- web_result, NULL) == 0) {
- printf("failed to start request\n");
+ if (g_web_request_get(web, argv[1], web_result, NULL) == 0) {
+ fprintf(stderr, "Failed to start request\n");
return 1;
}
return 1;
}