From b6390f9bd899370317ae2cd96271b21f07fdf637 Mon Sep 17 00:00:00 2001 From: Jacob Erlbeck Date: Tue, 8 Oct 2013 12:04:46 +0200 Subject: gb: Use the NS-VCI to find an existing NS-VC Currently when a NS-RESET is recevied over a link that has not yet been associated with a NS-VC, the NSEI is used to find an existing NS-VC. If one is found, the reset procedure is initiated. This behaviour is not conformant with 3GPP TS 08.16 (see chapter 4.2.3) which allows to use several NS-VC between two endpoints in parallel. The patch changes the implementation to use the NSVCI instead of the NSEI to search for an existing NS-VC object. Ticket: OW#874 Sponsored-by: On-Waves ehf --- src/gb/gprs_ns.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index 0fed43c5..b5f91c49 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -823,7 +823,7 @@ int gprs_ns_vc_create(struct gprs_ns_inst *nsi, struct msgb *msg, struct gprs_nsvc *existing_nsvc; struct tlv_parsed tp; - uint16_t nsei; + uint16_t nsvci; int rc; @@ -868,10 +868,10 @@ int gprs_ns_vc_create(struct gprs_ns_inst *nsi, struct msgb *msg, msg); return -EINVAL; } - nsei = ntohs(*(uint16_t *) TLVP_VAL(&tp, NS_IE_NSEI)); - /* Check if we already know this NSEI, the remote end might + nsvci = ntohs(*(uint16_t *) TLVP_VAL(&tp, NS_IE_VCI)); + /* Check if we already know this NSVCI, the remote end might * simply have changed addresses, or it is a SGSN */ - existing_nsvc = gprs_nsvc_by_nsei(nsi, nsei); + existing_nsvc = gprs_nsvc_by_nsvci(nsi, nsvci); if (!existing_nsvc) { *new_nsvc = gprs_nsvc_create(nsi, 0xffff); log_set_context(GPRS_CTX_NSVC, *new_nsvc); -- cgit v1.2.3