Hi Lucas,
> drivers/ifxmodem/gprs-context.c | 95
> +++++++++++++++++++++++++++++++++++++--
> 1 files changed, 91 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/ifxmodem/gprs-context.c b/drivers/ifxmodem/gprs-context.c
> index 2c68b44..0d133f9 100644
> --- a/drivers/ifxmodem/gprs-context.c
> +++ b/drivers/ifxmodem/gprs-context.c
> @@ -29,6 +29,11 @@
> #include <stdio.h>
> #include <errno.h>
> #include <sys/stat.h>
> +#include <sys/ioctl.h>
> +#include <net/if.h>
> +#include <arpa/inet.h>
> +#include <linux/if_ether.h>
> +#include <linux/gsmmux.h>
see comments from other review.
> #include <glib.h>
>
> @@ -63,6 +68,7 @@ struct gprs_context_data {
> char username[OFONO_GPRS_MAX_USERNAME_LENGTH + 1];
> char password[OFONO_GPRS_MAX_PASSWORD_LENGTH + 1];
> GAtRawIP *rawip;
> + gboolean use_ofono_mux;
Call this internal_rawip or something. It has nothing to do with the mux
itself actually.
> enum state state;
> char address[32];
> char dns1[32];
> @@ -79,7 +85,46 @@ static void rawip_debug(const char *str, void *data)
> ofono_info("%s: %s", (const char *) data, str);
> }
>
> -static const char *setup_rawip(struct ofono_gprs_context *gc)
> +static const char *setup_rawip_kmux(struct ofono_gprs_context *gc)
I do not like the name kmux. If you call the other one internal, then
just call this setup_rawip.
> +{
> + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
> + struct gsm_netconfig netconfig;
> + int fd;
> + int n;
Why don't you call n what it is. It is the index.
> + char *interface = NULL;
Don't assign values at declaration time. There will be only a few cases
where this is really required.
> + char ifname[IFNAMSIZ];
> +
> + memset(&netconfig, 0, sizeof(struct gsm_netconfig));
> + gcd->rawip = NULL;
> +
> + fd = g_io_channel_unix_get_fd(g_at_chat_get_channel(gcd->chat));
> +
> + g_at_chat_suspend(gcd->chat);
> +
> + netconfig.adaption = 3;
> + netconfig.protocol = htons(ETH_P_IP);
> +
> + n = ioctl(fd, GSMIOC_ENABLE_NET, &netconfig);
> + if (n < 0) {
> + ofono_error("Cannot enable network on the mux: %d", n);
> + return NULL;
Don't you wanna resume the the GAtChat here?
> + }
> +
> + ofono_info("Net index: %d", n);
Debug information and not ofono_info.
> + interface = if_indextoname(n, ifname);
> + if (interface == NULL) {
> + ofono_error("Interface index %d error %d error msg %s", n,
> + errno, strerror(errno));
> + return NULL;
See comment above about resume.
> + }
> +
> + ofono_info("Interface name: %s", interface);
> +
> + return interface;
> +}
> +
> +static const char *setup_rawip_internal(struct ofono_gprs_context *gc)
> {
> struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
> GAtIO *io;
> @@ -153,7 +198,14 @@ static void session_cb(gboolean ok, GAtResult *result,
> gpointer user_data)
> dns[1] = gcd->dns2;
> dns[2] = 0;
>
> - interface = setup_rawip(gc);
> + if (gcd->use_ofono_mux == FALSE) {
> + ofono_info("Calling setup_rawip_kmux()");
> + interface = setup_rawip_kmux(gc);
> + } else {
> + ofono_info("Calling setup_rawip_internal()");
> + interface = setup_rawip_internal(gc);
> + }
> +
> if (interface == NULL)
> interface = "invalid";
>
> @@ -352,7 +404,9 @@ static void deactivate_cb(gboolean ok, GAtResult *result,
> gpointer user_data)
>
> DBG("ok %d", ok);
>
> - g_at_rawip_unref(gcd->rawip);
> + if (gcd->rawip)
> + g_at_rawip_unref(gcd->rawip);
> +
> gcd->rawip = NULL;
If you do a NULL check, then put the reset to NULL operation in the same
if statement.
>
> gcd->active_context = 0;
> @@ -370,6 +424,8 @@ static void ifx_gprs_deactivate_primary(struct
> ofono_gprs_context *gc,
> struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
> GAtChat *chat = g_at_chat_get_slave(gcd->chat);
> char buf[64];
> + int fd;
> + int n;
You might wanna call it err here instead of n.
> DBG("cid %u", cid);
>
> @@ -377,7 +433,14 @@ static void ifx_gprs_deactivate_primary(struct
> ofono_gprs_context *gc,
> gcd->down_cb = cb;
> gcd->cb_data = data;
>
> - g_at_rawip_shutdown(gcd->rawip);
> + if (gcd->rawip)
> + g_at_rawip_shutdown(gcd->rawip);
> +
> + fd = g_io_channel_unix_get_fd(g_at_chat_get_channel(gcd->chat));
> +
> + n = ioctl(fd, GSMIOC_DISABLE_NET, NULL);
> + if (n < 0)
> + ofono_error("Cannot disable network on the mux: %d", n);
>
> sprintf(buf, "AT+CGACT=0,%u", gcd->active_context);
> if (g_at_chat_send(chat, buf, none_prefix,
> @@ -394,6 +457,8 @@ static void cgev_notify(GAtResult *result, gpointer
> user_data)
> const char *event;
> int cid;
> GAtResultIter iter;
> + int fd;
> + int n;
>
> g_at_result_iter_init(&iter, result);
>
> @@ -424,6 +489,14 @@ static void cgev_notify(GAtResult *result, gpointer
> user_data)
> gcd->rawip = NULL;
> }
>
> + if (gcd->use_ofono_mux == FALSE) {
> + fd = g_io_channel_unix_get_fd(g_at_chat_get_channel(gcd->chat));
> +
> + n = ioctl(fd, GSMIOC_DISABLE_NET, NULL);
> + if (n < 0)
> + ofono_error("Cannot disable network on the mux: %d", n);
> + }
> +
Now we are duplicating to much code. You need to split this out into a
function.
> ofono_gprs_context_deactivated(gc, gcd->active_context);
>
> gcd->active_context = 0;
> @@ -436,7 +509,9 @@ static int ifx_gprs_context_probe(struct
> ofono_gprs_context *gc,
> unsigned int vendor, void *data)
> {
> GAtChat *chat = data;
> + const char *ldisc;
> struct gprs_context_data *gcd;
> + struct ofono_modem *modem;
> struct stat st;
>
> DBG("");
> @@ -455,6 +530,18 @@ static int ifx_gprs_context_probe(struct
> ofono_gprs_context *gc,
>
> gcd->chat = g_at_chat_clone(chat);
>
> + modem = ofono_gprs_context_get_modem(gc);
> + ldisc = ofono_modem_get_string(modem, "LineDiscipline");
> +
> + ofono_info("Got LineDiscipline variable from udev: %s", ldisc);
> + if (ldisc != NULL) {
> + ofono_info("setting up to use kernel mux for data");
> + gcd->use_ofono_mux = FALSE;
> + } else {
> + ofono_info("setting up to use user space mux for data");
> + gcd->use_ofono_mux = TRUE;
> + }
> +
> ofono_gprs_context_set_data(gc, gcd);
>
> chat = g_at_chat_get_slave(gcd->chat);
Regards
Marcel
_______________________________________________
ofono mailing list
[email protected]
http://lists.ofono.org/listinfo/ofono