2:39 a.m.
From: Pekka Pessi <Pekka.Pessi(a)nokia.com>
---
drivers/atmodem/gprs-context.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/atmodem/gprs-context.c b/drivers/atmodem/gprs-context.c
index 03c6f46..11551e4 100644
--- a/drivers/atmodem/gprs-context.c
+++ b/drivers/atmodem/gprs-context.c
@@ -95,7 +95,7 @@ static void ppp_connect(const char *interface, const char *local,
gcd->state = STATE_ACTIVE;
CALLBACK_WITH_SUCCESS(gcd->up_cb, interface, TRUE, local,
STATIC_IP_NETMASK, NULL,
- dns, gcd->cb_data);
+ dns, NULL, gcd->cb_data);
}
static void ppp_disconnect(GAtPPPDisconnectReason reason, gpointer user_data)
@@ -111,7 +111,7 @@ static void ppp_disconnect(GAtPPPDisconnectReason reason, gpointer
user_data)
switch (gcd->state) {
case STATE_ENABLING:
CALLBACK_WITH_FAILURE(gcd->up_cb, NULL, FALSE, NULL,
- NULL, NULL, NULL, gcd->cb_data);
+ NULL, NULL, NULL, NULL, gcd->cb_data);
break;
case STATE_DISABLING:
CALLBACK_WITH_SUCCESS(gcd->down_cb, gcd->cb_data);
@@ -181,7 +181,7 @@ static void at_cgdata_cb(gboolean ok, GAtResult *result, gpointer
user_data)
gcd->state = STATE_IDLE;
decode_at_error(&error, g_at_result_final_response(result));
- gcd->up_cb(&error, NULL, 0, NULL, NULL, NULL, NULL,
+ gcd->up_cb(&error, NULL, 0, NULL, NULL, NULL, NULL, NULL,
gcd->cb_data);
return;
}
@@ -204,7 +204,7 @@ static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer
user_data)
gcd->state = STATE_IDLE;
decode_at_error(&error, g_at_result_final_response(result));
- gcd->up_cb(&error, NULL, 0, NULL, NULL, NULL, NULL,
+ gcd->up_cb(&error, NULL, 0, NULL, NULL, NULL, NULL, NULL,
gcd->cb_data);
return;
}
@@ -217,7 +217,7 @@ static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer
user_data)
gcd->active_context = 0;
gcd->state = STATE_IDLE;
- CALLBACK_WITH_FAILURE(gcd->up_cb, NULL, 0, NULL, NULL, NULL, NULL,
+ CALLBACK_WITH_FAILURE(gcd->up_cb, NULL, 0, NULL, NULL, NULL, NULL, NULL,
gcd->cb_data);
}
@@ -249,7 +249,7 @@ static void at_gprs_activate_primary(struct ofono_gprs_context *gc,
at_cgdcont_cb, gc, NULL) > 0)
return;
- CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, data);
+ CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, NULL, data);
}
static void at_gprs_deactivate_primary(struct ofono_gprs_context *gc,
--
1.7.1
2:39 a.m.
New subject: [P-CSCF PATCH 2/8] hso: add p-cscf parameters into context_up cb
From: Pekka Pessi <Pekka.Pessi(a)nokia.com>
---
drivers/hsomodem/gprs-context.c | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/hsomodem/gprs-context.c b/drivers/hsomodem/gprs-context.c
index dc6f1b6..afd7fcf 100644
--- a/drivers/hsomodem/gprs-context.c
+++ b/drivers/hsomodem/gprs-context.c
@@ -110,7 +110,7 @@ static void at_owancall_up_cb(gboolean ok, GAtResult *result,
gcd->active_context = 0;
decode_at_error(&error, g_at_result_final_response(result));
- cb(&error, NULL, FALSE, NULL, NULL, NULL, NULL, cbd->data);
+ cb(&error, NULL, FALSE, NULL, NULL, NULL, NULL, NULL, cbd->data);
}
static void hso_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
@@ -128,7 +128,7 @@ static void hso_cgdcont_cb(gboolean ok, GAtResult *result, gpointer
user_data)
gcd->active_context = 0;
decode_at_error(&error, g_at_result_final_response(result));
- cb(&error, NULL, 0, NULL, NULL, NULL, NULL, cbd->data);
+ cb(&error, NULL, 0, NULL, NULL, NULL, NULL, NULL, cbd->data);
return;
}
@@ -144,7 +144,8 @@ static void hso_cgdcont_cb(gboolean ok, GAtResult *result, gpointer
user_data)
gcd->active_context = 0;
- CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, cbd->data);
+ CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, NULL,
+ cbd->data);
}
static void hso_gprs_activate_primary(struct ofono_gprs_context *gc,
@@ -189,7 +190,7 @@ static void hso_gprs_activate_primary(struct ofono_gprs_context *gc,
error:
g_free(cbd);
- CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, data);
+ CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, NULL, data);
}
static void hso_gprs_deactivate_primary(struct ofono_gprs_context *gc,
@@ -273,7 +274,8 @@ static void owandata_cb(gboolean ok, GAtResult *result, gpointer
user_data)
ofono_info("DNS: %s, %s", dns1, dns2);
CALLBACK_WITH_SUCCESS(gcd->up_cb, interface, TRUE, ip,
- STATIC_IP_NETMASK, gateway, dns, gcd->cb_data);
+ STATIC_IP_NETMASK, gateway, dns, NULL,
+ gcd->cb_data);
gcd->hso_state = HSO_NONE;
gcd->up_cb = NULL;
@@ -338,7 +340,8 @@ static void owancall_notifier(GAtResult *result, gpointer user_data)
if (gcd->hso_state == HSO_ENABLING) {
CALLBACK_WITH_FAILURE(gcd->up_cb, NULL, 0, NULL,
- NULL, NULL, NULL, gcd->cb_data);
+ NULL, NULL, NULL, NULL,
+ gcd->cb_data);
gcd->hso_state = HSO_NONE;
gcd->up_cb = NULL;
gcd->cb_data = NULL;
--
1.7.1
2:39 a.m.
New subject: [P-CSCF PATCH 3/8] huawei: add p-cscf parameters into context_up cb
From: Pekka Pessi <Pekka.Pessi(a)nokia.com>
---
drivers/huaweimodem/gprs-context.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/huaweimodem/gprs-context.c b/drivers/huaweimodem/gprs-context.c
index 48e21ab..43e5248 100644
--- a/drivers/huaweimodem/gprs-context.c
+++ b/drivers/huaweimodem/gprs-context.c
@@ -69,7 +69,7 @@ static gboolean dhcp_poll(gpointer user_data)
if (gcd->dhcp_count > 20)
CALLBACK_WITH_FAILURE(gcd->up_cb, NULL, 0, NULL, NULL,
- NULL, NULL, gcd->cb_data);
+ NULL, NULL, NULL, gcd->cb_data);
else
check_dhcp(gc);
@@ -193,7 +193,7 @@ static void dhcp_query_cb(gboolean ok, GAtResult *result, gpointer
user_data)
interface = "invalid";
CALLBACK_WITH_SUCCESS(gcd->up_cb, interface, TRUE, ip,
- netmask, gateway, dns, gcd->cb_data);
+ netmask, gateway, dns, NULL, gcd->cb_data);
gcd->up_cb = NULL;
gcd->cb_data = NULL;
@@ -261,7 +261,7 @@ static void at_ndisdup_up_cb(gboolean ok, GAtResult *result,
gcd->active_context = 0;
decode_at_error(&error, g_at_result_final_response(result));
- cb(&error, NULL, FALSE, NULL, NULL, NULL, NULL, cbd->data);
+ cb(&error, NULL, FALSE, NULL, NULL, NULL, NULL, NULL, cbd->data);
}
static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
@@ -281,7 +281,7 @@ static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer
user_data)
gcd->active_context = 0;
decode_at_error(&error, g_at_result_final_response(result));
- cb(&error, NULL, 0, NULL, NULL, NULL, NULL, cbd->data);
+ cb(&error, NULL, 0, NULL, NULL, NULL, NULL, NULL, cbd->data);
return;
}
@@ -297,7 +297,8 @@ static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer
user_data)
gcd->active_context = 0;
- CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, cbd->data);
+ CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, NULL,
+ cbd->data);
}
static void huawei_gprs_activate_primary(struct ofono_gprs_context *gc,
@@ -331,7 +332,7 @@ static void huawei_gprs_activate_primary(struct ofono_gprs_context
*gc,
error:
g_free(cbd);
- CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, data);
+ CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, NULL, data);
}
static void huawei_gprs_deactivate_primary(struct ofono_gprs_context *gc,
--
1.7.1
2:39 a.m.
New subject: [P-CSCF PATCH 4/8] ifx: add p-cscf parameters into context_up cb
From: Pekka Pessi <Pekka.Pessi(a)nokia.com>
---
drivers/ifxmodem/gprs-context.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/ifxmodem/gprs-context.c b/drivers/ifxmodem/gprs-context.c
index 2a2b8df..54a466f 100644
--- a/drivers/ifxmodem/gprs-context.c
+++ b/drivers/ifxmodem/gprs-context.c
@@ -124,12 +124,12 @@ static void failed_setup(struct ofono_gprs_context *gc,
if (!result) {
CALLBACK_WITH_FAILURE(gcd->up_cb, NULL, 0, NULL, NULL,
- NULL, NULL, gcd->cb_data);
+ NULL, NULL, NULL, gcd->cb_data);
return;
}
decode_at_error(&error, g_at_result_final_response(result));
- gcd->up_cb(&error, NULL, 0, NULL, NULL, NULL, NULL, gcd->cb_data);
+ gcd->up_cb(&error, NULL, 0, NULL, NULL, NULL, NULL, NULL, gcd->cb_data);
}
static void session_cb(gboolean ok, GAtResult *result, gpointer user_data)
@@ -158,7 +158,8 @@ static void session_cb(gboolean ok, GAtResult *result, gpointer
user_data)
interface = "invalid";
CALLBACK_WITH_SUCCESS(gcd->up_cb, interface, TRUE, gcd->address,
- STATIC_IP_NETMASK, NULL, dns, gcd->cb_data);
+ STATIC_IP_NETMASK, NULL, dns, NULL,
+ gcd->cb_data);
gcd->up_cb = NULL;
gcd->cb_data = NULL;
@@ -342,7 +343,7 @@ static void ifx_gprs_activate_primary(struct ofono_gprs_context *gc,
setup_cb, gc, NULL) > 0)
return;
- CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, data);
+ CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, NULL, data);
}
static void deactivate_cb(gboolean ok, GAtResult *result, gpointer user_data)
--
1.7.1
2:39 a.m.
New subject: [P-CSCF PATCH 5/8] isi: add p-cscf parameters into context_up cb
From: Pekka Pessi <Pekka.Pessi(a)nokia.com>
---
drivers/isimodem/gprs-context.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/isimodem/gprs-context.c b/drivers/isimodem/gprs-context.c
index 47e858a..febf299 100644
--- a/drivers/isimodem/gprs-context.c
+++ b/drivers/isimodem/gprs-context.c
@@ -132,7 +132,7 @@ static gboolean gprs_up_fail(struct context_data *cd)
struct ofono_gprs_context *gc = cd->driver;
struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
- CALLBACK_WITH_FAILURE(cd->up_cb, NULL, 0, NULL, NULL, NULL, NULL,
+ CALLBACK_WITH_FAILURE(cd->up_cb, NULL, 0, NULL, NULL, NULL, NULL, NULL,
cd->data);
gcd->contexts = g_slist_remove(gcd->contexts, cd);
@@ -276,7 +276,7 @@ static void activate_ind_cb(GIsiClient *client,
CALLBACK_WITH_SUCCESS(cd->up_cb, ifname, TRUE, (const char *)ip,
STATIC_IP_NETMASK, NULL,
- dns, cd->data);
+ dns, NULL, cd->data);
return;
error:
--
1.7.1
2:39 a.m.
New subject: [P-CSCF PATCH 6/8] mbm: add p-cscf parameters into context_up cb
From: Pekka Pessi <Pekka.Pessi(a)nokia.com>
---
drivers/mbmmodem/gprs-context.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/mbmmodem/gprs-context.c b/drivers/mbmmodem/gprs-context.c
index 553b7fd..c5a4cf0 100644
--- a/drivers/mbmmodem/gprs-context.c
+++ b/drivers/mbmmodem/gprs-context.c
@@ -142,8 +142,8 @@ out:
ofono_info("DNS: %s, %s", dns[0], dns[1]);
CALLBACK_WITH_SUCCESS(gcd->up_cb, interface, success, ip,
- STATIC_IP_NETMASK, gateway,
- success ? dns : NULL, gcd->cb_data);
+ STATIC_IP_NETMASK, gateway,
+ success ? dns : NULL, NULL, gcd->cb_data);
gcd->mbm_state = MBM_NONE;
gcd->up_cb = NULL;
gcd->cb_data = NULL;
@@ -170,7 +170,7 @@ static void mbm_get_ip_details(struct ofono_gprs_context *gc)
modem = ofono_gprs_context_get_modem(gc);
interface = ofono_modem_get_string(modem, "NetworkInterface");
CALLBACK_WITH_SUCCESS(gcd->up_cb, interface, FALSE, NULL, NULL,
- NULL, NULL, gcd->cb_data);
+ NULL, NULL, NULL, gcd->cb_data);
gcd->mbm_state = MBM_NONE;
gcd->up_cb = NULL;
@@ -195,7 +195,7 @@ static void mbm_state_changed(struct ofono_gprs_context *gc, int
state)
gcd->down_cb = NULL;
} else if (gcd->mbm_state == MBM_ENABLING) {
CALLBACK_WITH_FAILURE(gcd->up_cb, NULL, 0, NULL, NULL,
- NULL, NULL, gcd->cb_data);
+ NULL, NULL, NULL, gcd->cb_data);
gcd->up_cb = NULL;
} else {
ofono_gprs_context_deactivated(gc, gcd->active_context);
@@ -314,7 +314,7 @@ static void mbm_enap_up_cb(gboolean ok, GAtResult *result, gpointer
user_data)
gcd->active_context = 0;
decode_at_error(&error, g_at_result_final_response(result));
- cb(&error, NULL, FALSE, NULL, NULL, NULL, NULL, cbd->data);
+ cb(&error, NULL, FALSE, NULL, NULL, NULL, NULL, NULL, cbd->data);
}
static void mbm_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
@@ -334,7 +334,7 @@ static void mbm_cgdcont_cb(gboolean ok, GAtResult *result, gpointer
user_data)
gcd->active_context = 0;
decode_at_error(&error, g_at_result_final_response(result));
- cb(&error, NULL, 0, NULL, NULL, NULL, NULL, cbd->data);
+ cb(&error, NULL, 0, NULL, NULL, NULL, NULL, NULL, cbd->data);
return;
}
@@ -350,7 +350,8 @@ static void mbm_cgdcont_cb(gboolean ok, GAtResult *result, gpointer
user_data)
gcd->active_context = 0;
- CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, cbd->data);
+ CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, NULL,
+ cbd->data);
}
static void mbm_gprs_activate_primary(struct ofono_gprs_context *gc,
@@ -396,7 +397,7 @@ static void mbm_gprs_activate_primary(struct ofono_gprs_context *gc,
error:
g_free(cbd);
- CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, data);
+ CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, NULL, data);
}
static void mbm_gprs_deactivate_primary(struct ofono_gprs_context *gc,
--
1.7.1
2:39 a.m.
New subject: [P-CSCF PATCH 7/8] ste: add NULL p-cscf parameter into context_up cb
From: Pekka Pessi <Pekka.Pessi(a)nokia.com>
---
drivers/stemodem/gprs-context.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/stemodem/gprs-context.c b/drivers/stemodem/gprs-context.c
index d3a50a9..f967512 100644
--- a/drivers/stemodem/gprs-context.c
+++ b/drivers/stemodem/gprs-context.c
@@ -290,11 +290,11 @@ static void ste_eppsd_up_cb(gboolean ok, GAtResult *result, gpointer
user_data)
conn->interface);
CALLBACK_WITH_SUCCESS(cb, NULL, FALSE, rsp.ip_address,
rsp.subnet_mask, rsp.default_gateway,
- dns, cbd->data);
+ dns, NULL, cbd->data);
} else {
CALLBACK_WITH_SUCCESS(cb, conn->interface,
FALSE, rsp.ip_address, rsp.subnet_mask,
- rsp.default_gateway, dns, cbd->data);
+ rsp.default_gateway, dns, NULL, cbd->data);
}
return;
@@ -308,7 +308,8 @@ error:
if (conn)
conn->cid = 0;
- CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, cbd->data);
+ CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, NULL,
+ cbd->data);
}
static void ste_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
@@ -328,7 +329,7 @@ static void ste_cgdcont_cb(gboolean ok, GAtResult *result, gpointer
user_data)
gcd->active_context = 0;
decode_at_error(&error, g_at_result_final_response(result));
- cb(&error, NULL, 0, NULL, NULL, NULL, NULL, cbd->data);
+ cb(&error, NULL, 0, NULL, NULL, NULL, NULL, NULL, cbd->data);
return;
}
@@ -357,7 +358,7 @@ error:
gcd->active_context = 0;
CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL,
- NULL, NULL, cbd->data);
+ NULL, NULL, NULL, cbd->data);
}
static void ste_gprs_activate_primary(struct ofono_gprs_context *gc,
@@ -400,7 +401,7 @@ static void ste_gprs_activate_primary(struct ofono_gprs_context *gc,
error:
g_free(cbd);
- CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, data);
+ CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, NULL, data);
}
static void ste_gprs_deactivate_primary(struct ofono_gprs_context *gc,
--
1.7.1
2:39 a.m.
New subject: [P-CSCF PATCH 8/8] phonesim: add p-cscf parameters into context_up cb
From: Pekka Pessi <Pekka.Pessi(a)nokia.com>
---
plugins/phonesim.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugins/phonesim.c b/plugins/phonesim.c
index d2faf42..e249d1b 100644
--- a/plugins/phonesim.c
+++ b/plugins/phonesim.c
@@ -88,7 +88,7 @@ static void at_cgact_up_cb(gboolean ok, GAtResult *result, gpointer
user_data)
decode_at_error(&error, g_at_result_final_response(result));
cb(&error, ok ? gcd->interface : NULL, FALSE,
- NULL, NULL, NULL, NULL, cbd->data);
+ NULL, NULL, NULL, NULL, NULL, cbd->data);
}
static void at_cgact_down_cb(gboolean ok, GAtResult *result, gpointer user_data)
@@ -130,7 +130,7 @@ static void phonesim_activate_primary(struct ofono_gprs_context *gc,
error:
g_free(cbd);
- CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, data);
+ CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, NULL, data);
}
static void phonesim_deactivate_primary(struct ofono_gprs_context *gc,
--
1.7.1
4344
days inactive
4344
days old
7 comments
1 participants
participants (1)
-
Pekka.Pessi＠nokia.com