From: Sjur Brændeland <sjur.brandel...@stericsson.com>

---
Hi Marcel.
I hope I have closed most of your review comments so far.
I had a go at using g_io_chanel_write_chars, but couldn't make it work,
and I (stubbornly ;-) do g_caif_devices = NULL, just in case someone choose
to call caif_rtnl_init more than once.

 Makefile.am                  |    2 +
 drivers/stemodem/caif_rtnl.c |  382 ++++++++++++++++++++++++++++++++++++++++++
 drivers/stemodem/caif_rtnl.h |   29 ++++
 3 files changed, 413 insertions(+), 0 deletions(-)
 create mode 100644 drivers/stemodem/caif_rtnl.c
 create mode 100644 drivers/stemodem/caif_rtnl.h

diff --git a/Makefile.am b/Makefile.am
index cd17fa2..aea91ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -226,6 +226,8 @@ builtin_sources += drivers/atmodem/atutil.h \
                        drivers/stemodem/stemodem.c \
                        drivers/stemodem/voicecall.c \
                        drivers/stemodem/radio-settings.c \
+                       drivers/stemodem/caif_rtnl.c \
+                       drivers/stemodem/caif_rtnl.h \
                        drivers/stemodem/gprs-context.c \
                        drivers/stemodem/caif_socket.h \
                        drivers/stemodem/if_caif.h
diff --git a/drivers/stemodem/caif_rtnl.c b/drivers/stemodem/caif_rtnl.c
new file mode 100644
index 0000000..82740ba
--- /dev/null
+++ b/drivers/stemodem/caif_rtnl.c
@@ -0,0 +1,382 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2010 ST-Ericsson AB.
+ *
+ *  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
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <fcntl.h>
+#include <linux/rtnetlink.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+
+#include "if_caif.h"
+#include "caif_rtnl.h"
+
+#define NLMSG_TAIL(nmsg) \
+       ((struct rtattr *) (((void *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
+
+struct iplink_req {
+       struct nlmsghdr n;
+       struct ifinfomsg i;
+       char pad[1024];
+
+       int request_id;
+       int type;
+       int conn_id;
+       gpointer user_data;
+       gboolean loop_enabled;
+
+       char ifname[IF_NAMESIZE];
+       int  ifindex;
+       caif_rtnl_create_cb_t callback;
+};
+
+static GSList *pending_requests;
+static guint32 rtnl_seqnr;
+static guint  rtnl_watch;
+static GIOChannel *channel;
+
+static gboolean get_ifname(struct ifinfomsg *msg, int bytes,
+                               const char **ifname)
+{
+       struct rtattr *attr;
+
+       for (attr = IFLA_RTA(msg); RTA_OK(attr, bytes);
+               attr = RTA_NEXT(attr, bytes)) {
+
+               if (attr->rta_type == IFLA_IFNAME &&
+                               ifname != NULL) {
+
+                       *ifname = RTA_DATA(attr);
+                       return TRUE;
+               }
+       }
+
+       return FALSE;
+}
+
+static void store_newlink_param(struct iplink_req *req, unsigned short type,
+                                       int index, unsigned flags,
+                                       unsigned change, struct ifinfomsg *msg,
+                                       int bytes)
+{
+       const char *ifname = NULL;
+
+       get_ifname(msg, bytes, &ifname);
+       strncpy(req->ifname, ifname,
+                       sizeof(req->ifname));
+       req->ifname[sizeof(req->ifname)-1] = '\0';
+       req->ifindex = index;
+}
+
+static int send_rtnl_req(struct iplink_req *req)
+{
+       struct sockaddr_nl addr;
+       int sk = g_io_channel_unix_get_fd(channel);
+
+       memset(&addr, 0, sizeof(addr));
+       addr.nl_family = AF_NETLINK;
+
+       return sendto(sk, req, req->n.nlmsg_len, 0,
+                       (struct sockaddr *) &addr, sizeof(addr));
+}
+
+static struct iplink_req *find_request(guint32 seq)
+{
+       GSList *list;
+
+       for (list = pending_requests; list; list = list->next) {
+               struct iplink_req *req = list->data;
+
+               if (req->n.nlmsg_seq == seq)
+                       return req;
+       }
+
+       return NULL;
+}
+
+static void rtnl_client_response(struct iplink_req *req, int result)
+{
+
+       if (req->callback && req->n.nlmsg_type == RTM_NEWLINK)
+               req->callback(result, req->user_data,
+                               req->ifname, req->ifindex);
+
+       pending_requests = g_slist_remove(pending_requests, req);
+       g_free(req);
+}
+
+static void parse_rtnl_message(void *buf, size_t len)
+{
+       struct ifinfomsg *msg;
+       struct iplink_req *req;
+
+       while (len > 0) {
+               struct nlmsghdr *hdr = buf;
+
+               if (!NLMSG_OK(hdr, len))
+                       break;
+
+               if (hdr->nlmsg_type == RTM_NEWLINK) {
+                       req = g_slist_nth_data(pending_requests, 0);
+                       if (req == NULL)
+                               break;
+
+                       msg = (struct ifinfomsg *) NLMSG_DATA(hdr);
+                       store_newlink_param(req, msg->ifi_type,
+                                       msg->ifi_index, msg->ifi_flags,
+                                       msg->ifi_change, msg,
+                                       IFA_PAYLOAD(hdr));
+                       rtnl_client_response(req, 0);
+                       return;
+
+               } else if (hdr->nlmsg_type == NLMSG_ERROR) {
+                       req = find_request(hdr->nlmsg_seq);
+                       if (req == NULL)
+                               break;
+
+                       DBG("nlmsg error req");
+                       rtnl_client_response(req, -1);
+                       return;
+               }
+
+               len -= hdr->nlmsg_len;
+               buf += hdr->nlmsg_len;
+       }
+}
+
+static int add_attribute(struct nlmsghdr *n, int maxlen, int type,
+                               const void *data, int datalen)
+{
+       int len = RTA_LENGTH(datalen);
+       struct rtattr *rta;
+
+       if ((int)(NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len)) > maxlen) {
+               DBG("attribute to large for message %d %d %d\n",
+                               n->nlmsg_len, len, maxlen);
+               return -1;
+       }
+
+       rta = NLMSG_TAIL(n);
+       rta->rta_type = type;
+       rta->rta_len = len;
+       memcpy(RTA_DATA(rta), data, datalen);
+       n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len);
+
+       return 0;
+}
+
+static int prep_rtnl_newlink_req(struct iplink_req *req)
+{
+       char type[] = "caif";
+       struct rtattr *linkinfo;
+       struct rtattr *data;
+
+       req->n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg));
+       req->n.nlmsg_flags = NLM_F_REQUEST|NLM_F_CREATE|NLM_F_EXCL;
+       req->n.nlmsg_type = RTM_NEWLINK;
+       req->n.nlmsg_seq = ++rtnl_seqnr;
+       req->i.ifi_family = AF_UNSPEC;
+
+       linkinfo = NLMSG_TAIL(&req->n);
+       add_attribute(&req->n, sizeof(*req), IFLA_LINKINFO,
+                       NULL, 0);
+       add_attribute(&req->n, sizeof(*req), IFLA_INFO_KIND,
+                       type, strlen(type));
+       data = NLMSG_TAIL(&req->n);
+       add_attribute(&req->n, sizeof(*req), IFLA_INFO_DATA,
+                       NULL, 0);
+
+       switch (req->type) {
+
+       case IFLA_CAIF_IPV4_CONNID:
+               add_attribute(&req->n, sizeof(*req),
+                               IFLA_CAIF_IPV4_CONNID, &req->conn_id,
+                               sizeof(req->conn_id));
+               break;
+
+       case IFLA_CAIF_IPV6_CONNID:
+               add_attribute(&req->n, sizeof(*req),
+                               IFLA_CAIF_IPV6_CONNID, &req->conn_id,
+                               sizeof(req->conn_id));
+               break;
+
+       case __IFLA_CAIF_UNSPEC:
+       case IFLA_CAIF_LOOPBACK:
+       case __IFLA_CAIF_MAX:
+               DBG("unsupported linktype");
+               return -EINVAL;
+       }
+
+       if (req->loop_enabled) {
+               int loop = 1;
+               add_attribute(&req->n, sizeof(*req),
+                               IFLA_CAIF_LOOPBACK, &loop, sizeof(loop));
+       }
+
+       data->rta_len = (void *)NLMSG_TAIL(&req->n) - (void *)data;
+       linkinfo->rta_len = (void *)NLMSG_TAIL(&req->n) - (void *)linkinfo;
+
+       return 0;
+}
+
+static void prep_rtnl_dellink_req(struct iplink_req *req, int ifindex)
+{
+       req->n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg));
+       req->n.nlmsg_flags = NLM_F_REQUEST|NLM_F_CREATE|NLM_F_EXCL;
+       req->n.nlmsg_type = RTM_DELLINK;
+       req->n.nlmsg_seq = ++rtnl_seqnr;
+       req->i.ifi_family = AF_UNSPEC;
+       req->i.ifi_index = ifindex;
+}
+
+static gboolean netlink_event(GIOChannel *chan,
+                               GIOCondition cond, gpointer data)
+{
+       unsigned char buf[4096];
+       gsize len;
+       GIOError err;
+
+       if (cond & (G_IO_NVAL | G_IO_HUP | G_IO_ERR)) {
+               rtnl_watch = 0;
+               return FALSE;
+       }
+
+       memset(buf, 0, sizeof(buf));
+
+       err = g_io_channel_read(chan, (gchar *) buf, sizeof(buf), &len);
+       if (err) {
+               if (err == G_IO_ERROR_AGAIN)
+                       return TRUE;
+               rtnl_watch = 0;
+               return FALSE;
+       }
+
+       parse_rtnl_message(buf, len);
+
+       return TRUE;
+}
+
+int caif_rtnl_init(void)
+{
+       struct sockaddr_nl addr;
+       int sk, err;
+       GError *gerr = NULL;
+
+       sk = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE);
+       if (sk < 0)
+               return sk;
+
+       memset(&addr, 0, sizeof(addr));
+       addr.nl_family = AF_NETLINK;
+       addr.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR | RTMGRP_IPV4_ROUTE;
+
+       err = bind(sk, (struct sockaddr *) &addr, sizeof(addr));
+       if (err < 0) {
+               close(sk);
+               return err;
+       }
+
+       channel = g_io_channel_unix_new(sk);
+       g_io_channel_set_flags(channel, G_IO_FLAG_NONBLOCK, &gerr);
+       g_io_channel_set_encoding(channel, NULL, &gerr);
+       g_io_channel_set_buffered(channel, TRUE);
+       g_io_channel_set_close_on_unref(channel, TRUE);
+
+       rtnl_watch = g_io_add_watch(channel,
+                               G_IO_IN | G_IO_NVAL | G_IO_HUP | G_IO_ERR,
+                               netlink_event, NULL);
+       pending_requests = NULL;
+
+       return 0;
+}
+
+void caif_rtnl_exit(void)
+{
+       GSList *list;
+
+       if (rtnl_watch > 0)
+               g_source_remove(rtnl_watch);
+
+       g_io_channel_unref(channel);
+
+       for (list = pending_requests; list; list = list->next) {
+               struct iplink_req *req = list->data;
+               g_free(req);
+       }
+
+       g_slist_free(pending_requests);
+}
+
+
+int caif_rtnl_create_interface(gpointer user_data, int type, int connid,
+               gboolean loop, caif_rtnl_create_cb_t cb)
+{
+       int err;
+       struct iplink_req *req;
+
+       req = g_try_new0(struct iplink_req, 1);
+       if (req == NULL)
+               return -ENOMEM;
+
+       req->user_data = user_data;
+       req->type = type;
+       req->conn_id = connid;
+       req->loop_enabled = loop;
+       req->callback = cb;
+
+       err = prep_rtnl_newlink_req(req);
+       if (err < 0)
+               goto error;
+
+       err = send_rtnl_req(req);
+       if (err < 0)
+               goto error;
+
+       pending_requests = g_slist_append(pending_requests, req);
+       return 0;
+error:
+       g_free(req);
+       return err;
+
+}
+
+int caif_rtnl_delete_interface(int ifid)
+{
+       struct iplink_req req;
+       int err;
+       memset(&req, 0, sizeof(req));
+       prep_rtnl_dellink_req(&req, ifid);
+
+       err = send_rtnl_req(&req);
+       if (err < 0)
+               return err;
+
+       return 0;
+}
diff --git a/drivers/stemodem/caif_rtnl.h b/drivers/stemodem/caif_rtnl.h
new file mode 100644
index 0000000..8eb1e5f
--- /dev/null
+++ b/drivers/stemodem/caif_rtnl.h
@@ -0,0 +1,29 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2010 ST-Ericsson AB.
+ *
+ *  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
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+typedef void (*caif_rtnl_create_cb_t) (int result, gpointer user_data,
+               char *ifname, int ifindex);
+
+extern int caif_rtnl_create_interface(gpointer user_data, int type, int connid,
+               gboolean loop, caif_rtnl_create_cb_t cb);
+extern int caif_rtnl_delete_interface(int ifid);
+
+extern int caif_rtnl_init(void);
+extern void caif_rtnl_exit(void);
-- 
1.6.3.3

_______________________________________________
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono

Reply via email to