osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

GPRS: remove hard-coded IP address for NSIP responses from SGSN->BTS

This commit is contained in:
Harald Welte 2010-03-18 00:01:43 +08:00
parent 9ba500559a
commit c547848ead
2 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openbsc/include/openbsc/gprs_ns.h
View File

@ -54,7 +54,7 @@ struct gprs_ns_link {
}; };
int gprs_ns_rcvmsg(struct msgb *msg); int gprs_ns_rcvmsg(struct msgb *msg, struct sockaddr_in *saddr);
int gprs_ns_sendmsg(struct gprs_ns_link *link, u_int16_t bvci, int gprs_ns_sendmsg(struct gprs_ns_link *link, u_int16_t bvci,
struct msgb *msg); struct msgb *msg);

54
openbsc/src/gprs_ns.c
View File

@ -85,6 +85,12 @@ struct gprs_nsvc {
struct timer_list alive_timer; struct timer_list alive_timer;
int timer_is_tns_alive; int timer_is_tns_alive;
int alive_retries; int alive_retries;
union {
struct {
struct sockaddr_in bts_addr;
} ip;
};
}; };
/* FIXME: dynamically search for the matching NSVC */ /* FIXME: dynamically search for the matching NSVC */
@ -116,12 +122,12 @@ static const char *gprs_ns_cause_str(enum ns_cause cause)
return "undefined"; return "undefined";
} }
static int gprs_ns_tx(struct msgb *msg) static int gprs_ns_tx(struct msgb *msg, struct gprs_nsvc *nsvc)
{ {
return ipac_gprs_send(msg); return ipac_gprs_send(msg, &nsvc->ip.bts_addr);
} }
static int gprs_ns_tx_simple(struct gprs_ns_link *link, u_int8_t pdu_type) static int gprs_ns_tx_simple(struct gprs_nsvc *nsvc, u_int8_t pdu_type)
{ {
struct msgb *msg = msgb_alloc(NS_ALLOC_SIZE, "GPRS/NS"); struct msgb *msg = msgb_alloc(NS_ALLOC_SIZE, "GPRS/NS");
struct gprs_ns_hdr *nsh; struct gprs_ns_hdr *nsh;
@ -133,7 +139,7 @@ static int gprs_ns_tx_simple(struct gprs_ns_link *link, u_int8_t pdu_type)
nsh->pdu_type = pdu_type; nsh->pdu_type = pdu_type;
return gprs_ns_tx(msg); return gprs_ns_tx(msg, nsvc);
} }
#define NS_TIMER_ALIVE 3, 0 /* after 3 seconds without response, we retry */ #define NS_TIMER_ALIVE 3, 0 /* after 3 seconds without response, we retry */
@ -157,7 +163,7 @@ static void gprs_ns_alive_cb(void *data)
} }
} else { } else {
/* Tns-test case: send NS-ALIVE PDU */ /* Tns-test case: send NS-ALIVE PDU */
gprs_ns_tx_simple(NULL, NS_PDUT_ALIVE); gprs_ns_tx_simple(nsvc, NS_PDUT_ALIVE);
/* start Tns-alive timer */ /* start Tns-alive timer */
nsvc->timer_is_tns_alive = 1; nsvc->timer_is_tns_alive = 1;
} }
@ -165,25 +171,28 @@ static void gprs_ns_alive_cb(void *data)
} }
/* Section 9.2.6 */ /* Section 9.2.6 */
static int gprs_ns_tx_reset_ack(u_int16_t nsvci, u_int16_t nsei) static int gprs_ns_tx_reset_ack(struct gprs_nsvc *nsvc)
{ {
struct msgb *msg = msgb_alloc(NS_ALLOC_SIZE, "GPRS/NS"); struct msgb *msg = msgb_alloc(NS_ALLOC_SIZE, "GPRS/NS");
struct gprs_ns_hdr *nsh; struct gprs_ns_hdr *nsh;
u_int16_t nsvci, nsei;
if (!msg) if (!msg)
return -ENOMEM; return -ENOMEM;
nsvci = htons(nsvci); nsvci = htons(nsvc->nsvci);
nsei = htons(nsei); nsei = htons(nsvc->nsei);
nsh = (struct gprs_ns_hdr *) msgb_put(msg, sizeof(*nsh)); nsh = (struct gprs_ns_hdr *) msgb_put(msg, sizeof(*nsh));
nsh->pdu_type = NS_PDUT_RESET_ACK; nsh->pdu_type = NS_PDUT_RESET_ACK;
DEBUGP(DGPRS, "nsvci=%u, nsei=%u\n", nsvc->nsvci, nsvc->nsei);
msgb_tvlv_put(msg, NS_IE_VCI, 2, (u_int8_t *)&nsvci); msgb_tvlv_put(msg, NS_IE_VCI, 2, (u_int8_t *)&nsvci);
msgb_tvlv_put(msg, NS_IE_NSEI, 2, (u_int8_t *)&nsei); msgb_tvlv_put(msg, NS_IE_NSEI, 2, (u_int8_t *)&nsei);
return gprs_ns_tx(msg); return gprs_ns_tx(msg, nsvc);
} }
/* Section 9.2.10: transmit side */ /* Section 9.2.10: transmit side */
@ -191,6 +200,7 @@ int gprs_ns_sendmsg(struct gprs_ns_link *link, u_int16_t bvci,
struct msgb *msg) struct msgb *msg)
{ {
struct gprs_ns_hdr *nsh; struct gprs_ns_hdr *nsh;
struct gprs_nsvc *nsvc = &dummy_nsvc;
nsh = (struct gprs_ns_hdr *) msgb_push(msg, sizeof(*nsh) + 3); nsh = (struct gprs_ns_hdr *) msgb_push(msg, sizeof(*nsh) + 3);
if (!nsh) { if (!nsh) {
@ -203,7 +213,7 @@ int gprs_ns_sendmsg(struct gprs_ns_link *link, u_int16_t bvci,
nsh->data[1] = bvci >> 8; nsh->data[1] = bvci >> 8;
nsh->data[2] = bvci & 0xff; nsh->data[2] = bvci & 0xff;
return gprs_ns_tx(msg); return gprs_ns_tx(msg, nsvc);
} }
/* Section 9.2.10: receive side */ /* Section 9.2.10: receive side */
@ -269,37 +279,37 @@ static int gprs_ns_rx_reset(struct msgb *msg)
nsvci = (u_int16_t *) TLVP_VAL(&tp, NS_IE_VCI); nsvci = (u_int16_t *) TLVP_VAL(&tp, NS_IE_VCI);
nsei = (u_int16_t *) TLVP_VAL(&tp, NS_IE_NSEI); nsei = (u_int16_t *) TLVP_VAL(&tp, NS_IE_NSEI);
*nsvci = ntohs(*nsvci); nsvc->state = NSE_S_BLOCKED | NSE_S_ALIVE;
*nsei = ntohs(*nsei); nsvc->nsei = ntohs(*nsei);
nsvc->nsvci = ntohs(*nsvci);
DEBUGPC(DGPRS, "cause=%s, NSVCI=%u, NSEI=%u\n", DEBUGPC(DGPRS, "cause=%s, NSVCI=%u, NSEI=%u\n",
gprs_ns_cause_str(*cause), *nsvci, *nsei); gprs_ns_cause_str(*cause), nsvc->nsvci, nsvc->nsei);
/* mark the NS-VC as blocked and alive */ /* mark the NS-VC as blocked and alive */
nsvc->state = NSE_S_BLOCKED | NSE_S_ALIVE;
nsvc->nsei = *nsei;
nsvc->nsvci = *nsvci;
/* start the test procedure */ /* start the test procedure */
nsvc->alive_timer.cb = gprs_ns_alive_cb; nsvc->alive_timer.cb = gprs_ns_alive_cb;
nsvc->alive_timer.data = nsvc; nsvc->alive_timer.data = nsvc;
bsc_schedule_timer(&nsvc->alive_timer, NS_TIMER_ALIVE); bsc_schedule_timer(&nsvc->alive_timer, NS_TIMER_ALIVE);
return gprs_ns_tx_reset_ack(*nsvci, *nsei); return gprs_ns_tx_reset_ack(nsvc);
} }
/* main entry point, here incoming NS frames enter */ /* main entry point, here incoming NS frames enter */
int gprs_ns_rcvmsg(struct msgb *msg) int gprs_ns_rcvmsg(struct msgb *msg, struct sockaddr_in *saddr)
{ {
struct gprs_ns_hdr *nsh = (struct gprs_ns_hdr *) msg->l2h; struct gprs_ns_hdr *nsh = (struct gprs_ns_hdr *) msg->l2h;
struct gprs_nsvc *nsvc = &dummy_nsvc; struct gprs_nsvc *nsvc = &dummy_nsvc;
int rc = 0; int rc = 0;
/* FIXME: do this properly! */
nsvc->ip.bts_addr = *saddr;
switch (nsh->pdu_type) { switch (nsh->pdu_type) {
case NS_PDUT_ALIVE: case NS_PDUT_ALIVE:
/* remote end inquires whether we're still alive, /* remote end inquires whether we're still alive,
* we need to respond with ALIVE_ACK */ * we need to respond with ALIVE_ACK */
rc = gprs_ns_tx_simple(NULL, NS_PDUT_ALIVE_ACK); rc = gprs_ns_tx_simple(nsvc, NS_PDUT_ALIVE_ACK);
break; break;
case NS_PDUT_ALIVE_ACK: case NS_PDUT_ALIVE_ACK:
/* stop Tns-alive */ /* stop Tns-alive */
@ -325,7 +335,7 @@ int gprs_ns_rcvmsg(struct msgb *msg)
/* Section 7.2: unblocking procedure */ /* Section 7.2: unblocking procedure */
DEBUGP(DGPRS, "NS UNBLOCK\n"); DEBUGP(DGPRS, "NS UNBLOCK\n");
nsvc->state &= ~NSE_S_BLOCKED; nsvc->state &= ~NSE_S_BLOCKED;
rc = gprs_ns_tx_simple(NULL, NS_PDUT_UNBLOCK_ACK); rc = gprs_ns_tx_simple(nsvc, NS_PDUT_UNBLOCK_ACK);
break; break;
case NS_PDUT_UNBLOCK_ACK: case NS_PDUT_UNBLOCK_ACK:
/* FIXME: mark remote NS-VC as unblocked + active */ /* FIXME: mark remote NS-VC as unblocked + active */
@ -333,7 +343,7 @@ int gprs_ns_rcvmsg(struct msgb *msg)
case NS_PDUT_BLOCK: case NS_PDUT_BLOCK:
DEBUGP(DGPRS, "NS BLOCK\n"); DEBUGP(DGPRS, "NS BLOCK\n");
nsvc->state |= NSE_S_BLOCKED; nsvc->state |= NSE_S_BLOCKED;
rc = gprs_ns_tx_simple(NULL, NS_PDUT_UNBLOCK_ACK); rc = gprs_ns_tx_simple(nsvc, NS_PDUT_UNBLOCK_ACK);
break; break;
case NS_PDUT_BLOCK_ACK: case NS_PDUT_BLOCK_ACK:
/* FIXME: mark remote NS-VC as blocked + active */ /* FIXME: mark remote NS-VC as blocked + active */