paulmataruso/osmo-ggsn
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-ggsn.git synced 2025-11-03 05:33:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use gtp_delete_context_req2() everywhere

Browse Source 
Replace calls to gtp_delete_context_req() with
gtp_delete_context_req2().

Related: OS#2741
Change-Id: Iecc8c5ac45207e7e20129559c4ac7f3c67dfb36a
This commit is contained in:
Oliver Smith
2019-05-13 11:35:03 +02:00
parent 9272d212c3
commit 6c08f9ceb7
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ggsn/ggsn.c
View File

@@ -107,7 +107,7 @@ static void pool_close_all_pdp(struct ippool_t *pool)
if (!pdp) if (!pdp)
continue; continue;
LOGPPDP(LOGL_DEBUG, pdp, "Sending DELETE PDP CTX due to shutdown\n"); LOGPPDP(LOGL_DEBUG, pdp, "Sending DELETE PDP CTX due to shutdown\n");
gtp_delete_context_req(pdp->gsn, pdp, NULL, 1); gtp_delete_context_req2(pdp->gsn, pdp, NULL, 1);
} }
} }
@@ -972,6 +972,15 @@ static void signal_handler(int s)
} }
} }
/* libgtp callback for confirmations */
static int cb_conf(int type, int cause, struct pdp_t *pdp, void *cbp)
{
switch (type) {
case GTP_DELETE_PDP_REQ:
return pdp_freepdp(pdp);
}
return 0;
}
/* Start a given GGSN */ /* Start a given GGSN */
int ggsn_start(struct ggsn_ctx *ggsn) int ggsn_start(struct ggsn_ctx *ggsn)
@@ -1018,6 +1027,7 @@ int ggsn_start(struct ggsn_ctx *ggsn)
gtp_set_cb_data_ind(ggsn->gsn, encaps_tun); gtp_set_cb_data_ind(ggsn->gsn, encaps_tun);
gtp_set_cb_delete_context(ggsn->gsn, delete_context); gtp_set_cb_delete_context(ggsn->gsn, delete_context);
gtp_set_cb_create_context_ind(ggsn->gsn, create_context_ind); gtp_set_cb_create_context_ind(ggsn->gsn, create_context_ind);
gtp_set_cb_conf(ggsn->gsn, cb_conf);
LOGPGGSN(LOGL_NOTICE, ggsn, "Successfully started\n"); LOGPGGSN(LOGL_NOTICE, ggsn, "Successfully started\n");
ggsn->started = true; ggsn->started = true;

4
sgsnemu/sgsnemu.c
View File

@@ -1474,6 +1474,7 @@ static int delete_pdp_conf(struct pdp_t *pdp, int cause)
{ {
printf("Received delete PDP context response. Cause value: %d\n", printf("Received delete PDP context response. Cause value: %d\n",
cause); cause);
pdp_freepdp(pdp);
return 0; return 0;
} }
@@ -1756,8 +1757,7 @@ int main(int argc, char **argv)
for (n = 0; n < options.contexts; n++) { for (n = 0; n < options.contexts; n++) {
/* Delete context */ /* Delete context */
printf("Disconnecting PDP context #%d\n", n); printf("Disconnecting PDP context #%d\n", n);
gtp_delete_context_req(gsn, iparr[n].pdp, NULL, gtp_delete_context_req2(gsn, iparr[n].pdp, NULL, 1);
1);
if ((options.pinghost.s_addr != 0) if ((options.pinghost.s_addr != 0)
&& ntransmitted) && ntransmitted)
ping_finish(); ping_finish();