Re: [PATCHv2 2/2] stemodem: Use RTNL to create network interfaces.
Hi Sjur, > drivers/stemodem/gprs-context.c | 43 -- > 1 files changed, 36 insertions(+), 7 deletions(-) patch has been applied. Regards Marcel ___ ofono mailing list ofono@ofono.org http://lists.ofono.org/listinfo/ofono
[PATCHv2 2/2] stemodem: Use RTNL to create network interfaces.
From: Sjur Brændeland
---
drivers/stemodem/gprs-context.c | 43 --
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/drivers/stemodem/gprs-context.c b/drivers/stemodem/gprs-context.c
index 7bdcdb8..1762fb3 100644
--- a/drivers/stemodem/gprs-context.c
+++ b/drivers/stemodem/gprs-context.c
@@ -47,6 +47,7 @@
#include "stemodem.h"
#include "caif_socket.h"
#include "if_caif.h"
+#include "caif_rtnl.h"
#define MAX_CAIF_DEVICES 4
#define MAX_DNS 2
@@ -172,12 +173,20 @@ static struct conn_info *conn_info_create(unsigned int
channel_id)
return connection;
}
-/*
- * Creates a new IP interface for CAIF.
- */
-static gboolean caif_if_create(struct conn_info *conn)
+static void rtnl_callback(int ifindex, const char *ifname, void *user_data)
{
- return FALSE;
+ struct conn_info *conn = user_data;
+
+ if (ifindex < 0) {
+ conn->created = FALSE;
+ ofono_error("Failed to create caif interface %s",
+ conn->interface);
+ return;
+ }
+
+ strncpy(conn->interface, ifname, sizeof(conn->interface));
+ conn->ifindex = ifindex;
+ conn->created = TRUE;
}
/*
@@ -185,6 +194,17 @@ static gboolean caif_if_create(struct conn_info *conn)
*/
static void caif_if_remove(struct conn_info *conn)
{
+ if (!conn->created)
+ return;
+
+ if (caif_rtnl_delete_interface(conn->ifindex) < 0) {
+ ofono_error("Failed to delete caif interface %s",
+ conn->interface);
+ return;
+ }
+
+ DBG("removed CAIF interface ch:%d ifname:%s ifindex:%d\n",
+ conn->channel_id, conn->interface, conn->ifindex);
}
static void ste_eppsd_down_cb(gboolean ok, GAtResult *result,
@@ -526,7 +546,7 @@ static int ste_gprs_context_probe(struct ofono_gprs_context
*gc,
GAtChat *chat = data;
struct gprs_context_data *gcd;
struct conn_info *ci;
- int i;
+ int i, err;
gcd = g_new0(struct gprs_context_data, 1);
gcd->chat = g_at_chat_clone(chat);
@@ -539,7 +559,14 @@ static int ste_gprs_context_probe(struct
ofono_gprs_context *gc,
ci = conn_info_create(i+1);
if (!ci)
return -ENOMEM;
- caif_if_create(ci);
+ err = caif_rtnl_create_interface(IFLA_CAIF_IPV4_CONNID,
+ ci->channel_id, FALSE,
+ rtnl_callback, ci);
+ if (err < 0) {
+ DBG("Failed to create IP interface for CAIF");
+ return err;
+ }
+
g_caif_devices = g_slist_append(g_caif_devices, ci);
}
@@ -571,10 +598,12 @@ static struct ofono_gprs_context_driver driver = {
void ste_gprs_context_init()
{
+ caif_rtnl_init();
ofono_gprs_context_driver_register(&driver);
}
void ste_gprs_context_exit()
{
ofono_gprs_context_driver_unregister(&driver);
+ caif_rtnl_exit();
}
--
1.7.0.4
___
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono
Re: [RESEND PATCHv2 2/2] stemodem: Use RTNL to create network interfaces.
Hi Sjur,
> diff --git a/drivers/stemodem/gprs-context.c b/drivers/stemodem/gprs-context.c
> index bfc0d65..21ca126 100644
> --- a/drivers/stemodem/gprs-context.c
> +++ b/drivers/stemodem/gprs-context.c
> @@ -47,6 +47,7 @@
> #include "stemodem.h"
> #include "caif_socket.h"
> #include "if_caif.h"
> +#include "caif_rtnl.h"
>
> #define MAX_CAIF_DEVICES 4
> #define MAX_DNS 2
> @@ -172,12 +173,20 @@ static struct conn_info *conn_info_create(unsigned int
> channel_id)
> return connection;
> }
>
> -/*
> - * Creates a new IP interface for CAIF.
> - */
> -static gboolean caif_if_create(struct conn_info *conn)
> +static void rtnl_callback(int ifindex, const char *ifname, void *user_data)
> {
> - return FALSE;
> + struct conn_info *conn = user_data;
> +
> + if (ifindex < 0) {
> + conn->created = FALSE;
> + ofono_error("Failed to create caif interface %s",
> + conn->interface);
> + return;
> + }
> +
> + strncpy(conn->interface, ifname, sizeof(conn->interface));
> + conn->ifindex = ifindex;
> + conn->created = TRUE;
> }
>
> /*
> @@ -185,6 +194,18 @@ static gboolean caif_if_create(struct conn_info *conn)
> */
> static void caif_if_remove(struct conn_info *conn)
> {
> + if (!conn->created)
> + return;
> +
> + if (caif_rtnl_delete_interface(conn->ifindex) < 0) {
> + ofono_error("Failed to delete caif interface %s",
> + conn->interface);
> + return;
> + }
> +
> + DBG("removed CAIF interface ch:%d ifname:%s ifindex:%d\n",
> + conn->channel_id, conn->interface, conn->ifindex);
> + return;
You don't need return here. Please remove that.
> }
>
> static void ste_eppsd_down_cb(gboolean ok, GAtResult *result,
> @@ -526,7 +547,7 @@ static int ste_gprs_context_probe(struct
> ofono_gprs_context *gc,
> GAtChat *chat = data;
> struct gprs_context_data *gcd;
> struct conn_info *ci;
> - int i;
> + int i,err;
Extra whitespace between i and err.
>
> gcd = g_new0(struct gprs_context_data, 1);
> gcd->chat = g_at_chat_clone(chat);
> @@ -539,7 +560,14 @@ static int ste_gprs_context_probe(struct
> ofono_gprs_context *gc,
> ci = conn_info_create(i+1);
> if (!ci)
> return -ENOMEM;
> - caif_if_create(ci);
> + err = caif_rtnl_create_interface(IFLA_CAIF_IPV4_CONNID,
> + ci->channel_id, FALSE,
> + rtnl_callback, ci);
> + if (err < 0) {
> + DBG("Failed to create IP interface for CAIF");
> + return err;
> + }
> +
> g_caif_devices = g_slist_append(g_caif_devices, ci);
> }
>
> @@ -571,10 +599,12 @@ static struct ofono_gprs_context_driver driver = {
>
> void ste_gprs_context_init()
> {
> + caif_rtnl_init();
> ofono_gprs_context_driver_register(&driver);
> }
>
> void ste_gprs_context_exit()
> {
> + caif_rtnl_exit();
> ofono_gprs_context_driver_unregister(&driver);
> }
Are you sure you want rtnl_exit before removing the driver?
Regards
Marcel
___
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono
[RESEND PATCHv2 2/2] stemodem: Use RTNL to create network interfaces.
From: Sjur Brændeland
---
drivers/stemodem/gprs-context.c | 44 --
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/drivers/stemodem/gprs-context.c b/drivers/stemodem/gprs-context.c
index bfc0d65..21ca126 100644
--- a/drivers/stemodem/gprs-context.c
+++ b/drivers/stemodem/gprs-context.c
@@ -47,6 +47,7 @@
#include "stemodem.h"
#include "caif_socket.h"
#include "if_caif.h"
+#include "caif_rtnl.h"
#define MAX_CAIF_DEVICES 4
#define MAX_DNS 2
@@ -172,12 +173,20 @@ static struct conn_info *conn_info_create(unsigned int
channel_id)
return connection;
}
-/*
- * Creates a new IP interface for CAIF.
- */
-static gboolean caif_if_create(struct conn_info *conn)
+static void rtnl_callback(int ifindex, const char *ifname, void *user_data)
{
- return FALSE;
+ struct conn_info *conn = user_data;
+
+ if (ifindex < 0) {
+ conn->created = FALSE;
+ ofono_error("Failed to create caif interface %s",
+ conn->interface);
+ return;
+ }
+
+ strncpy(conn->interface, ifname, sizeof(conn->interface));
+ conn->ifindex = ifindex;
+ conn->created = TRUE;
}
/*
@@ -185,6 +194,18 @@ static gboolean caif_if_create(struct conn_info *conn)
*/
static void caif_if_remove(struct conn_info *conn)
{
+ if (!conn->created)
+ return;
+
+ if (caif_rtnl_delete_interface(conn->ifindex) < 0) {
+ ofono_error("Failed to delete caif interface %s",
+ conn->interface);
+ return;
+ }
+
+ DBG("removed CAIF interface ch:%d ifname:%s ifindex:%d\n",
+ conn->channel_id, conn->interface, conn->ifindex);
+ return;
}
static void ste_eppsd_down_cb(gboolean ok, GAtResult *result,
@@ -526,7 +547,7 @@ static int ste_gprs_context_probe(struct ofono_gprs_context
*gc,
GAtChat *chat = data;
struct gprs_context_data *gcd;
struct conn_info *ci;
- int i;
+ int i,err;
gcd = g_new0(struct gprs_context_data, 1);
gcd->chat = g_at_chat_clone(chat);
@@ -539,7 +560,14 @@ static int ste_gprs_context_probe(struct
ofono_gprs_context *gc,
ci = conn_info_create(i+1);
if (!ci)
return -ENOMEM;
- caif_if_create(ci);
+ err = caif_rtnl_create_interface(IFLA_CAIF_IPV4_CONNID,
+ ci->channel_id, FALSE,
+ rtnl_callback, ci);
+ if (err < 0) {
+ DBG("Failed to create IP interface for CAIF");
+ return err;
+ }
+
g_caif_devices = g_slist_append(g_caif_devices, ci);
}
@@ -571,10 +599,12 @@ static struct ofono_gprs_context_driver driver = {
void ste_gprs_context_init()
{
+ caif_rtnl_init();
ofono_gprs_context_driver_register(&driver);
}
void ste_gprs_context_exit()
{
+ caif_rtnl_exit();
ofono_gprs_context_driver_unregister(&driver);
}
--
1.6.3.3
___
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono
