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 "Fix crash caused by decryption response delay" into tizen
[platform/upstream/connman.git]
/
vpn
/
vpn-rtnl.c
diff --git
a/vpn/vpn-rtnl.c
b/vpn/vpn-rtnl.c
old mode 100644
(file)
new mode 100755
(executable)
index
a7565db
..
5a02d77
--- a/
vpn/vpn-rtnl.c
+++ b/
vpn/vpn-rtnl.c
@@
-184,7
+184,7
@@
int vpn_rtnl_register(struct vpn_rtnl *rtnl)
rtnl_list = g_slist_insert_sorted(rtnl_list, rtnl,
compare_priority);
rtnl_list = g_slist_insert_sorted(rtnl_list, rtnl,
compare_priority);
-
__
vpn_ipconfig_foreach(trigger_rtnl, rtnl);
+ vpn_ipconfig_foreach(trigger_rtnl, rtnl);
return 0;
}
return 0;
}
@@
-797,75
+797,71
@@
static const char *type2string(uint16_t type)
static GIOChannel *channel = NULL;
static GIOChannel *channel = NULL;
-struct rtnl_request {
- struct nlmsghdr hdr;
- struct rtgenmsg msg;
-};
-#define RTNL_REQUEST_SIZE (sizeof(struct nlmsghdr) + sizeof(struct rtgenmsg))
+#define RTNL_REQUEST_SIZE (NLMSG_HDRLEN + NLMSG_ALIGN(sizeof(struct rtgenmsg)))
static GSList *request_list = NULL;
static guint32 request_seq = 0;
static GSList *request_list = NULL;
static guint32 request_seq = 0;
-static struct
rtnl_request
*find_request(guint32 seq)
+static struct
nlmsghdr
*find_request(guint32 seq)
{
GSList *list;
for (list = request_list; list; list = list->next) {
{
GSList *list;
for (list = request_list; list; list = list->next) {
- struct
rtnl_request *req
= list->data;
+ struct
nlmsghdr *hdr
= list->data;
- if (
req->hdr.
nlmsg_seq == seq)
- return
req
;
+ if (
hdr->
nlmsg_seq == seq)
+ return
hdr
;
}
return NULL;
}
}
return NULL;
}
-static int send_request(struct
rtnl_request *req
)
+static int send_request(struct
nlmsghdr *hdr
)
{
struct sockaddr_nl addr;
int sk;
debug("%s len %d type %d flags 0x%04x seq %d",
{
struct sockaddr_nl addr;
int sk;
debug("%s len %d type %d flags 0x%04x seq %d",
- type2string(
req->hdr.
nlmsg_type),
-
req->hdr.nlmsg_len, req->hdr.
nlmsg_type,
-
req->hdr.nlmsg_flags, req->hdr.
nlmsg_seq);
+ type2string(
hdr->
nlmsg_type),
+
hdr->nlmsg_len, hdr->
nlmsg_type,
+
hdr->nlmsg_flags, hdr->
nlmsg_seq);
sk = g_io_channel_unix_get_fd(channel);
memset(&addr, 0, sizeof(addr));
addr.nl_family = AF_NETLINK;
sk = g_io_channel_unix_get_fd(channel);
memset(&addr, 0, sizeof(addr));
addr.nl_family = AF_NETLINK;
- return sendto(sk,
req, req->hdr.
nlmsg_len, 0,
+ return sendto(sk,
hdr, hdr->
nlmsg_len, 0,
(struct sockaddr *) &addr, sizeof(addr));
}
(struct sockaddr *) &addr, sizeof(addr));
}
-static int queue_request(struct
rtnl_request *req
)
+static int queue_request(struct
nlmsghdr *hdr
)
{
{
- request_list = g_slist_append(request_list,
req
);
+ request_list = g_slist_append(request_list,
hdr
);
if (g_slist_length(request_list) > 1)
return 0;
if (g_slist_length(request_list) > 1)
return 0;
- return send_request(
req
);
+ return send_request(
hdr
);
}
static int process_response(guint32 seq)
{
}
static int process_response(guint32 seq)
{
- struct
rtnl_request *req
;
+ struct
nlmsghdr *hdr
;
debug("seq %d", seq);
debug("seq %d", seq);
-
req
= find_request(seq);
- if (
req
) {
- request_list = g_slist_remove(request_list,
req
);
- g_free(
req
);
+
hdr
= find_request(seq);
+ if (
hdr
) {
+ request_list = g_slist_remove(request_list,
hdr
);
+ g_free(
hdr
);
}
}
-
req
= g_slist_nth_data(request_list, 0);
- if (!
req
)
+
hdr
= g_slist_nth_data(request_list, 0);
+ if (!
hdr
)
return 0;
return 0;
- return send_request(
req
);
+ return send_request(
hdr
);
}
static void rtnl_message(void *buf, size_t len)
}
static void rtnl_message(void *buf, size_t len)
@@
-879,7
+875,7
@@
static void rtnl_message(void *buf, size_t len)
if (!NLMSG_OK(hdr, len))
break;
if (!NLMSG_OK(hdr, len))
break;
- debug("%s len %
d type %d flags 0x%04x seq %d pid %d
",
+ debug("%s len %
u type %u flags 0x%04x seq %u pid %u
",
type2string(hdr->nlmsg_type),
hdr->nlmsg_len, hdr->nlmsg_type,
hdr->nlmsg_flags, hdr->nlmsg_seq,
type2string(hdr->nlmsg_type),
hdr->nlmsg_len, hdr->nlmsg_type,
hdr->nlmsg_flags, hdr->nlmsg_seq,
@@
-960,62
+956,65
@@
static gboolean netlink_event(GIOChannel *chan, GIOCondition cond, gpointer data
static int send_getlink(void)
{
static int send_getlink(void)
{
- struct rtnl_request *req;
+ struct nlmsghdr *hdr;
+ struct rtgenmsg *msg;
debug("");
debug("");
- req = g_try_malloc0(RTNL_REQUEST_SIZE);
- if (!req)
- return -ENOMEM;
+ hdr = g_malloc0(RTNL_REQUEST_SIZE);
+
+ hdr->nlmsg_len = RTNL_REQUEST_SIZE;
+ hdr->nlmsg_type = RTM_GETLINK;
+ hdr->nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
+ hdr->nlmsg_pid = 0;
+ hdr->nlmsg_seq = request_seq++;
- req->hdr.nlmsg_len = RTNL_REQUEST_SIZE;
- req->hdr.nlmsg_type = RTM_GETLINK;
- req->hdr.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
- req->hdr.nlmsg_pid = 0;
- req->hdr.nlmsg_seq = request_seq++;
- req->msg.rtgen_family = AF_INET;
+ msg = (struct rtgenmsg *) NLMSG_DATA(hdr);
+ msg->rtgen_family = AF_INET;
- return queue_request(
req
);
+ return queue_request(
hdr
);
}
static int send_getaddr(void)
{
}
static int send_getaddr(void)
{
- struct rtnl_request *req;
+ struct nlmsghdr *hdr;
+ struct rtgenmsg *msg;
debug("");
debug("");
- req = g_try_malloc0(RTNL_REQUEST_SIZE);
- if (!req)
- return -ENOMEM;
+ hdr = g_malloc0(RTNL_REQUEST_SIZE);
- req->hdr.nlmsg_len = RTNL_REQUEST_SIZE;
- req->hdr.nlmsg_type = RTM_GETADDR;
- req->hdr.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
- req->hdr.nlmsg_pid = 0;
- req->hdr.nlmsg_seq = request_seq++;
- req->msg.rtgen_family = AF_INET;
+ hdr->nlmsg_len = RTNL_REQUEST_SIZE;
+ hdr->nlmsg_type = RTM_GETADDR;
+ hdr->nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
+ hdr->nlmsg_pid = 0;
+ hdr->nlmsg_seq = request_seq++;
- return queue_request(req);
+ msg = (struct rtgenmsg *) NLMSG_DATA(hdr);
+ msg->rtgen_family = AF_INET;
+
+ return queue_request(hdr);
}
static int send_getroute(void)
{
}
static int send_getroute(void)
{
- struct rtnl_request *req;
+ struct nlmsghdr *hdr;
+ struct rtgenmsg *msg;
debug("");
debug("");
- req = g_try_malloc0(RTNL_REQUEST_SIZE);
- if (!req)
- return -ENOMEM;
+ hdr = g_malloc0(RTNL_REQUEST_SIZE);
+
+ hdr->nlmsg_len = RTNL_REQUEST_SIZE;
+ hdr->nlmsg_type = RTM_GETROUTE;
+ hdr->nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
+ hdr->nlmsg_pid = 0;
+ hdr->nlmsg_seq = request_seq++;
- req->hdr.nlmsg_len = RTNL_REQUEST_SIZE;
- req->hdr.nlmsg_type = RTM_GETROUTE;
- req->hdr.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
- req->hdr.nlmsg_pid = 0;
- req->hdr.nlmsg_seq = request_seq++;
- req->msg.rtgen_family = AF_INET;
+ msg = (struct rtgenmsg *) NLMSG_DATA(hdr);
+ msg->rtgen_family = AF_INET;
- return queue_request(
req
);
+ return queue_request(
hdr
);
}
static gboolean update_timeout_cb(gpointer user_data)
}
static gboolean update_timeout_cb(gpointer user_data)
@@
-1158,14
+1157,14
@@
void __vpn_rtnl_cleanup(void)
update_list = NULL;
for (list = request_list; list; list = list->next) {
update_list = NULL;
for (list = request_list; list; list = list->next) {
- struct
rtnl_request *req
= list->data;
+ struct
nlmsghdr *hdr
= list->data;
debug("%s len %d type %d flags 0x%04x seq %d",
debug("%s len %d type %d flags 0x%04x seq %d",
- type2string(
req->hdr.
nlmsg_type),
-
req->hdr.nlmsg_len, req->hdr.
nlmsg_type,
-
req->hdr.nlmsg_flags, req->hdr.
nlmsg_seq);
+ type2string(
hdr->
nlmsg_type),
+
hdr->nlmsg_len, hdr->
nlmsg_type,
+
hdr->nlmsg_flags, hdr->
nlmsg_seq);
- g_free(
req
);
+ g_free(
hdr
);
list->data = NULL;
}
list->data = NULL;
}