openbsc[master]: create_pdp_conf(): factor out PDP context accept dispatch as...
diff mbox

Message ID gerrit.1464694966936.Ie7dff857a76c1464988b2f514643518937b57c5a@gerrit.osmocom.org
State New
Headers show

Commit Message

gerrit-no-reply@lists.osmocom.org May 31, 2016, 11:42 a.m. UTC
Review at  https://gerrit.osmocom.org/150

create_pdp_conf(): factor out PDP context accept dispatch as send_act_pdp_cont_acc()

Change-Id: Ie7dff857a76c1464988b2f514643518937b57c5a
---
M openbsc/src/gprs/sgsn_libgtp.c
1 file changed, 14 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/50/150/1

Comments

gerrit-no-reply@lists.osmocom.org May 31, 2016, 11:50 a.m. UTC | #1
Neels Hofmeyr has abandoned this change.

Change subject: create_pdp_conf(): factor out PDP context accept dispatch as send_act_pdp_cont_acc()
......................................................................


Abandoned

trying with another submit type
because of weird merge conflicts

Patch
diff mbox

diff --git a/openbsc/src/gprs/sgsn_libgtp.c b/openbsc/src/gprs/sgsn_libgtp.c
index f7a4ca0..504590b 100644
--- a/openbsc/src/gprs/sgsn_libgtp.c
+++ b/openbsc/src/gprs/sgsn_libgtp.c
@@ -304,10 +304,22 @@ 
 	{ 0, 0 }
 };
 
+static int send_act_pdp_cont_acc(struct sgsn_pdp_ctx *pctx)
+{
+	struct sgsn_signal_data sig_data;
+
+	/* Inform others about it */
+	memset(&sig_data, 0, sizeof(sig_data));
+	sig_data.pdp = pctx;
+	osmo_signal_dispatch(SS_SGSN, S_SGSN_PDP_ACT, &sig_data);
+
+	/* Send PDP CTX ACT to MS */
+	return gsm48_tx_gsm_act_pdp_acc(pctx);
+}
+
 /* The GGSN has confirmed the creation of a PDP Context */
 static int create_pdp_conf(struct pdp_t *pdp, void *cbp, int cause)
 {
-	struct sgsn_signal_data sig_data;
 	struct sgsn_pdp_ctx *pctx = cbp;
 	uint8_t reject_cause;
 
@@ -342,14 +354,7 @@ 
 
 	/* Activate the SNDCP layer */
 	sndcp_sm_activate_ind(&pctx->mm->gb.llme->lle[pctx->sapi], pctx->nsapi);
-
-	/* Inform others about it */
-	memset(&sig_data, 0, sizeof(sig_data));
-	sig_data.pdp = pctx;
-	osmo_signal_dispatch(SS_SGSN, S_SGSN_PDP_ACT, &sig_data);
-
-	/* Send PDP CTX ACT to MS */
-	return gsm48_tx_gsm_act_pdp_acc(pctx);
+	return send_act_pdp_cont_acc(pctx);
 
 reject:
 	/*