summaryrefslogtreecommitdiff
path: root/gweb
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2010-10-30 15:53:50 +0200
committerMarcel Holtmann <marcel@holtmann.org>2010-10-30 15:53:50 +0200
commitcfb55ed986edf9a51f8cc2fc9d81a015ab90c5c6 (patch)
tree429bc5253cf1a5f1494b8e6420aab06ac1bf8419 /gweb
parent9533b9b43154b23177e3b4f57ca977cfe4103cb0 (diff)
downloadconnman-cfb55ed986edf9a51f8cc2fc9d81a015ab90c5c6.tar.gz
connman-cfb55ed986edf9a51f8cc2fc9d81a015ab90c5c6.tar.bz2
connman-cfb55ed986edf9a51f8cc2fc9d81a015ab90c5c6.zip
Add support for adding custom user agent string
Diffstat (limited to 'gweb')
-rw-r--r--gweb/gweb.c33
-rw-r--r--gweb/gweb.h3
2 files changed, 35 insertions, 1 deletions
diff --git a/gweb/gweb.c b/gweb/gweb.c
index 9103df9c..3dd36936 100644
--- a/gweb/gweb.c
+++ b/gweb/gweb.c
@@ -70,6 +70,7 @@ struct _GWeb {
GList *session_list;
GResolv *resolv;
+ char *user_agent;
GWebDebugFunc debug_func;
gpointer debug_data;
@@ -175,6 +176,7 @@ void g_web_unref(GWeb *web)
g_resolv_unref(web->resolv);
+ g_free(web->user_agent);
g_free(web);
}
@@ -199,6 +201,31 @@ gboolean g_web_add_nameserver(GWeb *web, const char *address)
return TRUE;
}
+static gboolean set_user_agent(GWeb *web, const char *format, va_list args)
+{
+ g_free(web->user_agent);
+ web->user_agent = g_strdup_vprintf(format, args);
+
+ debug(web, "user agent %s", web->user_agent);
+
+ return TRUE;
+}
+
+gboolean g_web_set_user_agent(GWeb *web, const char *format, ...)
+{
+ va_list args;
+ gboolean result;
+
+ if (web == NULL)
+ return FALSE;
+
+ va_start(args, format);
+ result = set_user_agent(web, format, args);
+ va_end(args);
+
+ return result;
+}
+
static gboolean received_data(GIOChannel *channel, GIOCondition cond,
gpointer user_data)
{
@@ -288,7 +315,11 @@ static void start_request(struct web_session *session)
buf = g_string_new(NULL);
g_string_append_printf(buf, "GET %s HTTP/1.1\r\n", session->request);
g_string_append_printf(buf, "Host: %s\r\n", session->host);
- g_string_append_printf(buf, "User-Agent: ConnMan/%s\r\n", VERSION);
+ if (session->web->user_agent == NULL)
+ g_string_append_printf(buf, "User-Agent: GWeb/%s\r\n", VERSION);
+ else
+ g_string_append_printf(buf, "User-Agent: %s\r\n",
+ session->web->user_agent);
g_string_append(buf, "Accept: */*\r\n");
g_string_append(buf, "\r\n");
str = g_string_free(buf, FALSE);
diff --git a/gweb/gweb.h b/gweb/gweb.h
index e32a8968..cf1446cd 100644
--- a/gweb/gweb.h
+++ b/gweb/gweb.h
@@ -54,6 +54,9 @@ void g_web_set_debug(GWeb *web, GWebDebugFunc func, gpointer user_data);
gboolean g_web_add_nameserver(GWeb *web, const char *address);
+gboolean g_web_set_user_agent(GWeb *web, const char *format, ...)
+ __attribute__((format(printf, 2, 3)));
+
guint g_web_request(GWeb *web, GWebMethod method, const char *url,
GWebResultFunc func, gpointer user_data);