summaryrefslogtreecommitdiff
path: root/gweb
diff options
context:
space:
mode:
authorS├ębastien Bianti <sebastien.bianti@linux.intel.com>2012-03-20 11:09:47 (GMT)
committerMarcel Holtmann <marcel@holtmann.org>2012-03-20 16:16:55 (GMT)
commit6e2e4e84e8fb996d5eaf53e0bfb4d0679c337bb4 (patch)
treed26275d3affa08a4e4ef12c6031bc33605774bc4 /gweb
parent94d7c90fe00a7a79b374b09ec3e3e3538c9d8090 (diff)
downloadconnman-6e2e4e84e8fb996d5eaf53e0bfb4d0679c337bb4.zip
connman-6e2e4e84e8fb996d5eaf53e0bfb4d0679c337bb4.tar.gz
connman-6e2e4e84e8fb996d5eaf53e0bfb4d0679c337bb4.tar.bz2
gweb: workaround for setsockopt failure
Setting socket option BINDTODEVICE requires CAP_NET_RAW capability.
Diffstat (limited to 'gweb')
-rw-r--r--gweb/gweb.c68
1 files changed, 56 insertions, 12 deletions
diff --git a/gweb/gweb.c b/gweb/gweb.c
index 365f67c..5ec4fb1 100644
--- a/gweb/gweb.c
+++ b/gweb/gweb.c
@@ -37,6 +37,7 @@
#include <netdb.h>
#include <net/if.h>
#include <netinet/tcp.h>
+#include <ifaddrs.h>
#include "giognutls.h"
#include "gresolv.h"
@@ -954,6 +955,57 @@ static gboolean received_data(GIOChannel *channel, GIOCondition cond,
return TRUE;
}
+static int bind_to_address(int sk, const char *interface, int family)
+{
+ struct ifaddrs *ifaddr_list, *ifaddr;
+ int size, err = -1;
+
+ if (getifaddrs(&ifaddr_list) < 0)
+ return err;
+
+ for (ifaddr = ifaddr_list; ifaddr != NULL; ifaddr = ifaddr->ifa_next) {
+ if (g_strcmp0(ifaddr->ifa_name, interface) != 0)
+ continue;
+
+ if (ifaddr->ifa_addr == NULL ||
+ ifaddr->ifa_addr->sa_family != family)
+ continue;
+
+ switch (family) {
+ case AF_INET:
+ size = sizeof(struct sockaddr_in);
+ break;
+ case AF_INET6:
+ size = sizeof(struct sockaddr_in6);
+ break;
+ default:
+ continue;
+ }
+
+ err = bind(sk, (struct sockaddr *) ifaddr->ifa_addr, size);
+ break;
+ }
+
+ freeifaddrs(ifaddr_list);
+ return err;
+}
+
+static inline int bind_socket(int sk, int index, int family)
+{
+ char interface[IF_NAMESIZE];
+ int err;
+
+ if (if_indextoname(index, interface) == NULL)
+ return -1;
+
+ err = setsockopt(sk, SOL_SOCKET, SO_BINDTODEVICE,
+ interface, IF_NAMESIZE);
+ if (err < 0)
+ err = bind_to_address(sk, interface, family);
+
+ return err;
+}
+
static int connect_session_transport(struct web_session *session)
{
GIOFlags flags;
@@ -965,18 +1017,10 @@ static int connect_session_transport(struct web_session *session)
return -EIO;
if (session->web->index > 0) {
- char interface[IF_NAMESIZE];
-
- memset(interface, 0, IF_NAMESIZE);
-
- if (if_indextoname(session->web->index, interface) != NULL) {
- if (setsockopt(sk, SOL_SOCKET, SO_BINDTODEVICE,
- interface, IF_NAMESIZE) < 0) {
- close(sk);
- return -EIO;
- }
-
- debug(session->web, "Use interface %s", interface);
+ if (bind_socket(sk, session->web->index,
+ session->addr->ai_family) < 0) {
+ close(sk);
+ return -EIO;
}
}