[PATCH] gb: When sending on a NS-VC group use the first active NS-VC
Currently this first NS-VC with a matching NSEI is always used to send a UNITDATA message via gprs_ns_sendmsg(). If the NS-VC found is either dead or blocked, an error is returned. This patch changes to code to skip blocked or dead NS-VCs while searching and return the error if no usable NS-VC is found. This makes it possible to have several NS-VCs per connection group. Sponsored-by: On-Waves ehf --- src/gb/gprs_ns.c | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index b5f91c4..7801b29 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -136,7 +136,7 @@ struct gprs_nsvc *gprs_nsvc_by_nsvci(struct gprs_ns_inst *nsi, uint16_t nsvci) /*! \brief Lookup struct gprs_nsvc based on NSEI * \param[in] nsi NS instance in which to search * \param[in] nsei NSEI to be searched - * \returns gprs_nsvc of respective NSEI + * \returns first gprs_nsvc of respective NSEI */ struct gprs_nsvc *gprs_nsvc_by_nsei(struct gprs_ns_inst *nsi, uint16_t nsei) { @@ -148,6 +148,20 @@ struct gprs_nsvc *gprs_nsvc_by_nsei(struct gprs_ns_inst *nsi, uint16_t nsei) return NULL; } +static struct gprs_nsvc *gprs_active_nsvc_by_nsei(struct gprs_ns_inst *nsi, + uint16_t nsei) +{ + struct gprs_nsvc *nsvc; + llist_for_each_entry(nsvc, &nsi->gprs_nsvcs, list) { + if (nsvc->nsei == nsei) { + if (nsvc->state & NSE_S_BLOCKED || + !(nsvc->state & NSE_S_ALIVE)) + return nsvc; + } + } + return NULL; +} + /* Lookup struct gprs_nsvc based on remote peer socket addr */ static struct gprs_nsvc *nsvc_by_rem_addr(struct gprs_ns_inst *nsi, struct sockaddr_in *sin) @@ -559,27 +573,24 @@ int gprs_ns_sendmsg(struct gprs_ns_inst *nsi, struct msgb *msg) struct gprs_ns_hdr *nsh; uint16_t bvci = msgb_bvci(msg); - nsvc = gprs_nsvc_by_nsei(nsi, msgb_nsei(msg)); + nsvc = gprs_active_nsvc_by_nsei(nsi, msgb_nsei(msg)); if (!nsvc) { - LOGP(DNS, LOGL_ERROR, "Unable to resolve NSEI %u " - "to NS-VC!\n", msgb_nsei(msg)); - msgb_free(msg); - return -EINVAL; - } - log_set_context(GPRS_CTX_NSVC, nsvc); + int rc; + if (gprs_nsvc_by_nsei(nsi, msgb_nsei(msg))) { + LOGP(DNS, LOGL_ERROR, + "All NS-VCs for NSEI %u are either dead or blocked!\n", + msgb_nsei(msg)); + rc = -EBUSY; + } else { + LOGP(DNS, LOGL_ERROR, "Unable to resolve NSEI %u " + "to NS-VC!\n", msgb_nsei(msg)); + rc = -EINVAL; + } - if (!(nsvc->state & NSE_S_ALIVE)) { - LOGP(DNS, LOGL_ERROR, "NSEI=%u is not alive, cannot send\n", - nsvc->nsei); msgb_free(msg); - return -EBUSY; - } - if (nsvc->state & NSE_S_BLOCKED) { - LOGP(DNS, LOGL_ERROR, "NSEI=%u is blocked, cannot send\n", - nsvc->nsei); - msgb_free(msg); - return -EBUSY; + return rc; } + log_set_context(GPRS_CTX_NSVC, nsvc); msg->l2h = msgb_push(msg, sizeof(*nsh) + 3); nsh = (struct gprs_ns_hdr *) msg->l2h; -- 1.7.9.5
This adds tests for the gprs_ns_sendmsg() function. For this it merges back functions from the gbproxy test. Sponsored-by: On-Waves ehf --- tests/gb/gprs_ns_test.c | 314 ++++++++++++++++++++++++++++++++++++++++++---- tests/gb/gprs_ns_test.ok | 141 +++++++++++++++++---- 2 files changed, 402 insertions(+), 53 deletions(-) diff --git a/tests/gb/gprs_ns_test.c b/tests/gb/gprs_ns_test.c index d7b769d..0921b61 100644 --- a/tests/gb/gprs_ns_test.c +++ b/tests/gb/gprs_ns_test.c @@ -26,6 +26,152 @@ #include <osmocom/gprs/gprs_ns.h> #include <osmocom/gprs/gprs_bssgp.h> +#define REMOTE_BSS_ADDR 0x01020304 +#define REMOTE_SGSN_ADDR 0x05060708 + +#define SGSN_NSEI 0x0100 + +static int gprs_process_message(struct gprs_ns_inst *nsi, const char *text, + struct sockaddr_in *peer, const unsigned char* data, + size_t data_len); + +static void send_ns_reset(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr, + enum ns_cause cause, uint16_t nsvci, uint16_t nsei) +{ + /* GPRS Network Service, PDU type: NS_RESET, + */ + unsigned char msg[12] = { + 0x02, 0x00, 0x81, 0x01, 0x01, 0x82, 0x11, 0x22, + 0x04, 0x82, 0x11, 0x22 + }; + + msg[3] = cause; + msg[6] = nsvci / 256; + msg[7] = nsvci % 256; + msg[10] = nsei / 256; + msg[11] = nsei % 256; + + gprs_process_message(nsi, "RESET", src_addr, msg, sizeof(msg)); +} + +static void send_ns_reset_ack(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr, + uint16_t nsvci, uint16_t nsei) +{ + /* GPRS Network Service, PDU type: NS_RESET_ACK, + */ + unsigned char msg[9] = { + 0x03, 0x01, 0x82, 0x11, 0x22, + 0x04, 0x82, 0x11, 0x22 + }; + + msg[3] = nsvci / 256; + msg[4] = nsvci % 256; + msg[7] = nsei / 256; + msg[8] = nsei % 256; + + gprs_process_message(nsi, "RESET_ACK", src_addr, msg, sizeof(msg)); +} + +static void send_ns_alive(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr) +{ + /* GPRS Network Service, PDU type: NS_ALIVE */ + unsigned char msg[1] = { + 0x0a + }; + + gprs_process_message(nsi, "ALIVE", src_addr, msg, sizeof(msg)); +} + +static void send_ns_alive_ack(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr) +{ + /* GPRS Network Service, PDU type: NS_ALIVE_ACK */ + unsigned char msg[1] = { + 0x0b + }; + + gprs_process_message(nsi, "ALIVE_ACK", src_addr, msg, sizeof(msg)); +} + +static void send_ns_unblock(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr) +{ + /* GPRS Network Service, PDU type: NS_UNBLOCK */ + unsigned char msg[1] = { + 0x06 + }; + + gprs_process_message(nsi, "UNBLOCK", src_addr, msg, sizeof(msg)); +} + +static void send_ns_unblock_ack(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr) +{ + /* GPRS Network Service, PDU type: NS_UNBLOCK_ACK */ + unsigned char msg[1] = { + 0x07 + }; + + gprs_process_message(nsi, "UNBLOCK_ACK", src_addr, msg, sizeof(msg)); +} + +static void send_ns_unitdata(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr, + uint16_t nsbvci, + const unsigned char *bssgp_msg, size_t bssgp_msg_size) +{ + /* GPRS Network Service, PDU type: NS_UNITDATA */ + unsigned char msg[4096] = { + 0x00, 0x00, 0x00, 0x00 + }; + + OSMO_ASSERT(bssgp_msg_size <= sizeof(msg) - 4); + + msg[2] = nsbvci / 256; + msg[3] = nsbvci % 256; + memcpy(msg + 4, bssgp_msg, bssgp_msg_size); + + gprs_process_message(nsi, "UNITDATA", src_addr, msg, bssgp_msg_size + 4); +} + +static void send_bssgp_reset(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr, + uint16_t bvci) +{ + /* GPRS Network Service, PDU type: NS_UNITDATA, BVCI 0 + * BSSGP RESET */ + unsigned char msg[22] = { + 0x22, 0x04, 0x82, 0x4a, + 0x2e, 0x07, 0x81, 0x08, 0x08, 0x88, 0x10, 0x20, + 0x30, 0x40, 0x50, 0x60, 0x10, 0x00 + }; + + msg[3] = bvci / 256; + msg[4] = bvci % 256; + + send_ns_unitdata(nsi, src_addr, 0, msg, sizeof(msg)); +} + +static void setup_ns(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr, + uint16_t nsvci, uint16_t nsei) +{ + printf("Setup NS-VC: remote 0x%08x:%d, " + "NSVCI 0x%04x(%d), NSEI 0x%04x(%d)\n\n", + ntohl(src_addr->sin_addr.s_addr), ntohs(src_addr->sin_port), + nsvci, nsvci, nsei, nsei); + + send_ns_reset(nsi, src_addr, NS_CAUSE_OM_INTERVENTION, nsvci, nsei); + send_ns_alive(nsi, src_addr); + send_ns_unblock(nsi, src_addr); + send_ns_alive_ack(nsi, src_addr); +} + +static void setup_bssgp(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr, + uint16_t bvci) +{ + printf("Setup BSSGP: remote 0x%08x:%d, " + "BVCI 0x%04x(%d)\n\n", + ntohl(src_addr->sin_addr.s_addr), ntohs(src_addr->sin_port), + bvci, bvci); + + send_bssgp_reset(nsi, src_addr, bvci); +} + /* GPRS Network Service, PDU type: NS_RESET, * Cause: O&M intervention, NS VCI: 0x1122, NSEI 0x1122 */ @@ -110,18 +256,45 @@ ssize_t sendto(int sockfd, const void *buf, size_t len, int flags, typedef ssize_t (*sendto_t)(int, const void *, size_t, int, const struct sockaddr *, socklen_t); static sendto_t real_sendto = NULL; + uint32_t dest_host = htonl(((struct sockaddr_in *)dest_addr)->sin_addr.s_addr); if (!real_sendto) real_sendto = dlsym(RTLD_NEXT, "sendto"); - if (((struct sockaddr_in *)dest_addr)->sin_addr.s_addr != htonl(0x01020304)) + if (dest_host == REMOTE_BSS_ADDR) + printf("MESSAGE to BSS, msg length %d\n%s\n\n", len, osmo_hexdump(buf, len)); + else if (dest_host == REMOTE_SGSN_ADDR) + printf("MESSAGE to SGSN, msg length %d\n%s\n\n", len, osmo_hexdump(buf, len)); + else return real_sendto(sockfd, buf, len, flags, dest_addr, addrlen); - printf("RESPONSE, msg length %d\n%s\n\n", len, osmo_hexdump(buf, len)); - return len; } +/* override */ +int gprs_ns_sendmsg(struct gprs_ns_inst *nsi, struct msgb *msg) +{ + typedef int (*gprs_ns_sendmsg_t)(struct gprs_ns_inst *nsi, struct msgb *msg); + static gprs_ns_sendmsg_t real_gprs_ns_sendmsg = NULL; + uint16_t bvci = msgb_bvci(msg); + uint16_t nsei = msgb_nsei(msg); + + unsigned char *buf = msg->data; + size_t len = msg->len; + + if (!real_gprs_ns_sendmsg) + real_gprs_ns_sendmsg = dlsym(RTLD_NEXT, "gprs_ns_sendmsg"); + + if (nsei == SGSN_NSEI) + printf("NS UNITDATA MESSAGE to SGSN, BVCI 0x%04x, msg length %d\n%s\n\n", + bvci, len, osmo_hexdump(buf, len)); + else + printf("NS UNITDATA MESSAGE to BSS, BVCI 0x%04x, msg length %d\n%s\n\n", + bvci, len, osmo_hexdump(buf, len)); + + return real_gprs_ns_sendmsg(nsi, msg); +} + static void dump_rate_ctr_group(FILE *stream, const char *prefix, struct rate_ctr_group *ctrg) { @@ -217,6 +390,34 @@ static int gprs_process_message(struct gprs_ns_inst *nsi, const char *text, stru return ret; } +static int gprs_send_message(struct gprs_ns_inst *nsi, const char *text, + uint16_t nsei, uint16_t bvci, + const unsigned char* data, size_t data_len) +{ + struct msgb *msg; + int ret; + if (data_len > NS_ALLOC_SIZE - NS_ALLOC_HEADROOM) { + fprintf(stderr, "message too long: %d\n", data_len); + return -1; + } + + msg = gprs_ns_msgb_alloc(); + memmove(msg->data, data, data_len); + msg->l2h = msg->data; + msgb_put(msg, data_len); + + msgb_nsei(msg) = nsei; + msgb_bvci(msg) = bvci; + + printf("SENDING %s to NSEI 0x%04x, BVCI 0x%04x\n", text, nsei, bvci); + + ret = gprs_ns_sendmsg(nsi, msg); + + printf("result (%s) = %d\n\n", text, ret); + + return ret; +} + static void gprs_dump_nsi(struct gprs_ns_inst *nsi) { struct gprs_nsvc *nsvc; @@ -224,71 +425,70 @@ static void gprs_dump_nsi(struct gprs_ns_inst *nsi) printf("Current NS-VCIs:\n"); llist_for_each_entry(nsvc, &nsi->gprs_nsvcs, list) { struct sockaddr_in *peer = &(nsvc->ip.bts_addr); - printf(" VCI 0x%04x, NSEI 0x%04x, peer 0x%08x:%d\n", + printf(" VCI 0x%04x, NSEI 0x%04x, peer 0x%08x:%d%s%s\n", nsvc->nsvci, nsvc->nsei, - ntohl(peer->sin_addr.s_addr), ntohs(peer->sin_port) + ntohl(peer->sin_addr.s_addr), ntohs(peer->sin_port), + nsvc->state & NSE_S_BLOCKED ? ", blocked" : "", + nsvc->state & NSE_S_ALIVE ? "" : ", dead" ); dump_rate_ctr_group(stdout, " ", nsvc->ctrg); } printf("\n"); } -static void test_ns() +static void test_bss_port_changes() { struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, NULL); struct sockaddr_in peer[4] = {{0},}; + struct sockaddr_in sgsn_peer= {0}; + + sgsn_peer.sin_family = AF_INET; + sgsn_peer.sin_port = htons(32000); + sgsn_peer.sin_addr.s_addr = htonl(REMOTE_SGSN_ADDR); peer[0].sin_family = AF_INET; peer[0].sin_port = htons(1111); - peer[0].sin_addr.s_addr = htonl(0x01020304); + peer[0].sin_addr.s_addr = htonl(REMOTE_BSS_ADDR); peer[1].sin_family = AF_INET; peer[1].sin_port = htons(2222); - peer[1].sin_addr.s_addr = htonl(0x01020304); + peer[1].sin_addr.s_addr = htonl(REMOTE_BSS_ADDR); peer[2].sin_family = AF_INET; peer[2].sin_port = htons(3333); - peer[2].sin_addr.s_addr = htonl(0x01020304); + peer[2].sin_addr.s_addr = htonl(REMOTE_BSS_ADDR); peer[3].sin_family = AF_INET; peer[3].sin_port = htons(4444); - peer[3].sin_addr.s_addr = htonl(0x01020304); + peer[3].sin_addr.s_addr = htonl(REMOTE_BSS_ADDR); - gprs_process_message(nsi, "RESET", &peer[0], - gprs_ns_reset, sizeof(gprs_ns_reset)); + printf("--- Setup, send BSSGP RESET ---\n\n"); + + setup_ns(nsi, &peer[0], 0x1122, 0x1122); gprs_dump_nsi(nsi); - gprs_process_message(nsi, "ALIVE", &peer[0], - gprs_ns_alive, sizeof(gprs_ns_alive)); - gprs_process_message(nsi, "UNBLOCK", &peer[0], - gprs_ns_unblock, sizeof(gprs_ns_unblock)); gprs_process_message(nsi, "BSSGP RESET", &peer[0], gprs_bssgp_reset, sizeof(gprs_bssgp_reset)); printf("--- Peer port changes, RESET, message remains unchanged ---\n\n"); - gprs_process_message(nsi, "RESET", &peer[1], - gprs_ns_reset, sizeof(gprs_ns_reset)); + send_ns_reset(nsi, &peer[1], NS_CAUSE_OM_INTERVENTION, 0x1122, 0x1122); gprs_dump_nsi(nsi); printf("--- Peer port changes, RESET, VCI changes ---\n\n"); - gprs_process_message(nsi, "RESET", &peer[2], - gprs_ns_reset_vci2, sizeof(gprs_ns_reset_vci2)); + send_ns_reset(nsi, &peer[2], NS_CAUSE_OM_INTERVENTION, 0x3344, 0x1122); gprs_dump_nsi(nsi); printf("--- Peer port changes, RESET, NSEI changes ---\n\n"); - gprs_process_message(nsi, "RESET", &peer[3], - gprs_ns_reset_nsei2, sizeof(gprs_ns_reset_nsei2)); + send_ns_reset(nsi, &peer[3], NS_CAUSE_OM_INTERVENTION, 0x1122, 0x3344); gprs_dump_nsi(nsi); printf("--- Peer port 3333, RESET, VCI is changed back ---\n\n"); - gprs_process_message(nsi, "RESET", &peer[2], - gprs_ns_reset, sizeof(gprs_ns_reset)); + send_ns_reset(nsi, &peer[2], NS_CAUSE_OM_INTERVENTION, 0x1122, 0x1122); gprs_dump_nsi(nsi); printf("--- Peer port 4444, RESET, NSEI is changed back ---\n\n"); - gprs_process_message(nsi, "RESET", &peer[3], - gprs_ns_reset, sizeof(gprs_ns_reset)); + send_ns_reset(nsi, &peer[3], NS_CAUSE_OM_INTERVENTION, 0x1122, 0x1122); gprs_dump_nsi(nsi); gprs_ns_destroy(nsi); @@ -296,6 +496,65 @@ static void test_ns() } +static void test_sgsn_output() +{ + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, NULL); + struct sockaddr_in sgsn_peer= {0}; + + sgsn_peer.sin_family = AF_INET; + sgsn_peer.sin_port = htons(32000); + sgsn_peer.sin_addr.s_addr = htonl(REMOTE_SGSN_ADDR); + + gprs_dump_nsi(nsi); + + printf("--- Send message to SGSN ---\n\n"); + + gprs_send_message(nsi, "BSSGP RESET", SGSN_NSEI, 0, + gprs_bssgp_reset+4, sizeof(gprs_bssgp_reset)-4); + + printf("--- Setup dead connection to SGSN ---\n\n"); + + gprs_ns_nsip_connect(nsi, &sgsn_peer, SGSN_NSEI, SGSN_NSEI+1); + gprs_dump_nsi(nsi); + + printf("--- Send message to SGSN ---\n\n"); + + gprs_send_message(nsi, "BSSGP RESET", SGSN_NSEI, 0, + gprs_bssgp_reset+4, sizeof(gprs_bssgp_reset)-4); + + printf("--- Make connection to SGSN alive ---\n\n"); + + send_ns_reset_ack(nsi, &sgsn_peer, SGSN_NSEI+1, SGSN_NSEI); + send_ns_alive_ack(nsi, &sgsn_peer); + gprs_dump_nsi(nsi); + + printf("--- Send message to SGSN ---\n\n"); + + gprs_send_message(nsi, "BSSGP RESET", SGSN_NSEI, 0, + gprs_bssgp_reset+4, sizeof(gprs_bssgp_reset)-4); + + printf("--- Unblock connection to SGSN ---\n\n"); + + send_ns_unblock_ack(nsi, &sgsn_peer); + send_ns_alive(nsi, &sgsn_peer); + gprs_dump_nsi(nsi); + + printf("--- Send message to SGSN ---\n\n"); + + gprs_send_message(nsi, "BSSGP RESET", SGSN_NSEI, 0, + gprs_bssgp_reset+4, sizeof(gprs_bssgp_reset)-4); + + printf("--- Send empty message with BVCI to SGSN ---\n\n"); + + gprs_send_message(nsi, "[empty]", SGSN_NSEI, 0x0102, + gprs_bssgp_reset, 0); + + + gprs_ns_destroy(nsi); + nsi = NULL; +} + + int bssgp_prim_cb(struct osmo_prim_hdr *oph, void *ctx) { return -1; @@ -311,7 +570,8 @@ int main(int argc, char **argv) osmo_signal_register_handler(SS_L_NS, &test_signal, NULL); printf("===== NS protocol test START\n"); - test_ns(); + test_bss_port_changes(); + test_sgsn_output(); printf("===== NS protocol test END\n\n"); exit(EXIT_SUCCESS); diff --git a/tests/gb/gprs_ns_test.ok b/tests/gb/gprs_ns_test.ok index 7be84ef..7366278 100644 --- a/tests/gb/gprs_ns_test.ok +++ b/tests/gb/gprs_ns_test.ok @@ -1,23 +1,24 @@ ===== NS protocol test START +--- Setup, send BSSGB RESET --- + +Setup NS-VC: remote 0x01020304:1111, NSVCI 0x1122(4386), NSEI 0x1122(4386) + PROCESSING RESET from 0x01020304:1111 02 00 81 01 01 82 11 22 04 82 11 22 ==> got signal NS_RESET, NS-VC 0x1122/1.2.3.4:1111 -RESPONSE, msg length 9 +MESSAGE to BSS, msg length 9 03 01 82 11 22 04 82 11 22 -RESPONSE, msg length 1 +MESSAGE to BSS, msg length 1 0a result (RESET) = 9 -Current NS-VCIs: - VCI 0x1122, NSEI 0x1122, peer 0x01020304:1111 - PROCESSING ALIVE from 0x01020304:1111 0a -RESPONSE, msg length 1 +MESSAGE to BSS, msg length 1 0b result (ALIVE) = 1 @@ -26,11 +27,19 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 ==> got signal NS_UNBLOCK, NS-VC 0x1122/1.2.3.4:1111 -RESPONSE, msg length 1 +MESSAGE to BSS, msg length 1 07 result (UNBLOCK) = 1 +PROCESSING ALIVE_ACK from 0x01020304:1111 +0b + +result (ALIVE_ACK) = 0 + +Current NS-VCIs: + VCI 0x1122, NSEI 0x1122, peer 0x01020304:1111 + PROCESSING BSSGP RESET from 0x01020304:1111 00 00 00 00 22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 @@ -45,16 +54,16 @@ PROCESSING RESET from 0x01020304:2222 02 00 81 01 01 82 11 22 04 82 11 22 ==> got signal NS_RESET, NS-VC 0x1122/1.2.3.4:2222 -RESPONSE, msg length 9 +MESSAGE to BSS, msg length 9 03 01 82 11 22 04 82 11 22 -RESPONSE, msg length 1 +MESSAGE to BSS, msg length 1 0a result (RESET) = 9 Current NS-VCIs: - VCI 0x1122, NSEI 0x1122, peer 0x01020304:2222 + VCI 0x1122, NSEI 0x1122, peer 0x01020304:2222, blocked --- Peer port changes, RESET, VCI changes --- @@ -62,17 +71,17 @@ PROCESSING RESET from 0x01020304:3333 02 00 81 01 01 82 33 44 04 82 11 22 ==> got signal NS_RESET, NS-VC 0x3344/1.2.3.4:3333 -RESPONSE, msg length 9 +MESSAGE to BSS, msg length 9 03 01 82 33 44 04 82 11 22 -RESPONSE, msg length 1 +MESSAGE to BSS, msg length 1 0a result (RESET) = 9 Current NS-VCIs: - VCI 0x3344, NSEI 0x1122, peer 0x01020304:3333 - VCI 0x1122, NSEI 0x1122, peer 0x01020304:2222 + VCI 0x3344, NSEI 0x1122, peer 0x01020304:3333, blocked + VCI 0x1122, NSEI 0x1122, peer 0x01020304:2222, blocked --- Peer port changes, RESET, NSEI changes --- @@ -80,17 +89,17 @@ PROCESSING RESET from 0x01020304:4444 02 00 81 01 01 82 11 22 04 82 33 44 ==> got signal NS_RESET, NS-VC 0x1122/1.2.3.4:4444 -RESPONSE, msg length 9 +MESSAGE to BSS, msg length 9 03 01 82 11 22 04 82 33 44 -RESPONSE, msg length 1 +MESSAGE to BSS, msg length 1 0a result (RESET) = 9 Current NS-VCIs: - VCI 0x3344, NSEI 0x1122, peer 0x01020304:3333 - VCI 0x1122, NSEI 0x3344, peer 0x01020304:4444 + VCI 0x3344, NSEI 0x1122, peer 0x01020304:3333, blocked + VCI 0x1122, NSEI 0x3344, peer 0x01020304:4444, blocked NS-VC changed NSEI : 1 --- Peer port 3333, RESET, VCI is changed back --- @@ -100,17 +109,17 @@ PROCESSING RESET from 0x01020304:3333 ==> got signal NS_REPLACED: 0x1122/1.2.3.4:4444 -> 0x3344/1.2.3.4:3333 ==> got signal NS_RESET, NS-VC 0x1122/1.2.3.4:3333 -RESPONSE, msg length 9 +MESSAGE to BSS, msg length 9 03 01 82 11 22 04 82 11 22 -RESPONSE, msg length 1 +MESSAGE to BSS, msg length 1 0a result (RESET) = 9 Current NS-VCIs: - VCI 0x3344, NSEI 0x1122, peer 0x00000000:0 - VCI 0x1122, NSEI 0x1122, peer 0x01020304:3333 + VCI 0x3344, NSEI 0x1122, peer 0x00000000:0, blocked + VCI 0x1122, NSEI 0x1122, peer 0x01020304:3333, blocked NS-VC replaced other count: 1 NS-VC changed NSEI : 2 @@ -120,19 +129,99 @@ PROCESSING RESET from 0x01020304:4444 02 00 81 01 01 82 11 22 04 82 11 22 ==> got signal NS_RESET, NS-VC 0x1122/1.2.3.4:4444 -RESPONSE, msg length 9 +MESSAGE to BSS, msg length 9 03 01 82 11 22 04 82 11 22 -RESPONSE, msg length 1 +MESSAGE to BSS, msg length 1 0a result (RESET) = 9 Current NS-VCIs: - VCI 0x3344, NSEI 0x1122, peer 0x00000000:0 - VCI 0x1122, NSEI 0x1122, peer 0x01020304:4444 + VCI 0x3344, NSEI 0x1122, peer 0x00000000:0, blocked + VCI 0x1122, NSEI 0x1122, peer 0x01020304:4444, blocked + NS-VC replaced other count: 1 + NS-VC changed NSEI : 2 + +--- Send message to SGSN --- + +SENDING BSSGP RESET to NSEI 0x0100, BVCI 0x0000 +NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 +22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 + +result (BSSGP RESET) = -22 + +--- Setup blocked connection to SGSN --- + +MESSAGE to SGSN, msg length 12 +02 00 81 01 01 82 01 01 04 82 01 00 + +PROCESSING RESET_ACK from 0x05060708:32000 +03 01 82 01 01 04 82 01 00 + +MESSAGE to SGSN, msg length 1 +0a + +result (RESET_ACK) = 1 + +PROCESSING ALIVE_ACK from 0x05060708:32000 +0b + +MESSAGE to SGSN, msg length 1 +06 + +result (ALIVE_ACK) = 1 + +--- Send message to SGSN --- + +SENDING BSSGP RESET to NSEI 0x0100, BVCI 0x0000 +NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 +22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 + +MESSAGE to SGSN, msg length 22 +00 00 00 00 22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 + +result (BSSGP RESET) = 22 + +--- Unblock connection to SGSN --- + +PROCESSING UNBLOCK_ACK from 0x05060708:32000 +07 + +==> got signal NS_UNBLOCK, NS-VC 0x0101/5.6.7.8:32000 +result (UNBLOCK_ACK) = 0 + +PROCESSING ALIVE from 0x05060708:32000 +0a + +MESSAGE to SGSN, msg length 1 +0b + +result (ALIVE) = 1 + +Current NS-VCIs: + VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000 + NS-VC Block count : 1 + VCI 0x3344, NSEI 0x1122, peer 0x00000000:0, blocked + VCI 0x1122, NSEI 0x1122, peer 0x01020304:4444, blocked NS-VC replaced other count: 1 NS-VC changed NSEI : 2 +--- Send message to SGSN --- + +SENDING BSSGP RESET to NSEI 0x0100, BVCI 0x0000 +NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 +22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 + +result (BSSGP RESET) = -16 + +--- Send empty message with BVCI to SGSN --- + +SENDING [empty] to NSEI 0x0100, BVCI 0x0102 +NS UNITDATA MESSAGE to SGSN, BVCI 0x0102, msg length 0 + + +result ([empty]) = -16 + ===== NS protocol test END -- 1.7.9.5
The state matching condition is inverted. This is corrected by this fix. Sponsored-by: On-Waves ehf --- src/gb/gprs_ns.c | 4 ++-- tests/gb/gprs_ns_test.ok | 42 ++++++++++++++++++++++++++++++------------ 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index bdc7ae3..6a35ad3 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -158,8 +158,8 @@ static struct gprs_nsvc *gprs_active_nsvc_by_nsei(struct gprs_ns_inst *nsi, struct gprs_nsvc *nsvc; llist_for_each_entry(nsvc, &nsi->gprs_nsvcs, list) { if (nsvc->nsei == nsei) { - if (nsvc->state & NSE_S_BLOCKED || - !(nsvc->state & NSE_S_ALIVE)) + if (!(nsvc->state & NSE_S_BLOCKED) && + nsvc->state & NSE_S_ALIVE) return nsvc; } } diff --git a/tests/gb/gprs_ns_test.ok b/tests/gb/gprs_ns_test.ok index 7366278..424d681 100644 --- a/tests/gb/gprs_ns_test.ok +++ b/tests/gb/gprs_ns_test.ok @@ -1,5 +1,5 @@ ===== NS protocol test START ---- Setup, send BSSGB RESET --- +--- Setup, send BSSGP RESET --- Setup NS-VC: remote 0x01020304:1111, NSVCI 0x1122(4386), NSEI 0x1122(4386) @@ -143,6 +143,8 @@ Current NS-VCIs: NS-VC replaced other count: 1 NS-VC changed NSEI : 2 +Current NS-VCIs: + --- Send message to SGSN --- SENDING BSSGP RESET to NSEI 0x0100, BVCI 0x0000 @@ -151,11 +153,24 @@ NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 result (BSSGP RESET) = -22 ---- Setup blocked connection to SGSN --- +--- Setup dead connection to SGSN --- MESSAGE to SGSN, msg length 12 02 00 81 01 01 82 01 01 04 82 01 00 +Current NS-VCIs: + VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000, blocked, dead + +--- Send message to SGSN --- + +SENDING BSSGP RESET to NSEI 0x0100, BVCI 0x0000 +NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 +22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 + +result (BSSGP RESET) = -16 + +--- Make connection to SGSN alive --- + PROCESSING RESET_ACK from 0x05060708:32000 03 01 82 01 01 04 82 01 00 @@ -172,16 +187,17 @@ MESSAGE to SGSN, msg length 1 result (ALIVE_ACK) = 1 +Current NS-VCIs: + VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000, blocked + NS-VC Block count : 1 + --- Send message to SGSN --- SENDING BSSGP RESET to NSEI 0x0100, BVCI 0x0000 NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 -MESSAGE to SGSN, msg length 22 -00 00 00 00 22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 - -result (BSSGP RESET) = 22 +result (BSSGP RESET) = -16 --- Unblock connection to SGSN --- @@ -202,10 +218,6 @@ result (ALIVE) = 1 Current NS-VCIs: VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000 NS-VC Block count : 1 - VCI 0x3344, NSEI 0x1122, peer 0x00000000:0, blocked - VCI 0x1122, NSEI 0x1122, peer 0x01020304:4444, blocked - NS-VC replaced other count: 1 - NS-VC changed NSEI : 2 --- Send message to SGSN --- @@ -213,7 +225,10 @@ SENDING BSSGP RESET to NSEI 0x0100, BVCI 0x0000 NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 -result (BSSGP RESET) = -16 +MESSAGE to SGSN, msg length 22 +00 00 00 00 22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 + +result (BSSGP RESET) = 22 --- Send empty message with BVCI to SGSN --- @@ -221,7 +236,10 @@ SENDING [empty] to NSEI 0x0100, BVCI 0x0102 NS UNITDATA MESSAGE to SGSN, BVCI 0x0102, msg length 0 -result ([empty]) = -16 +MESSAGE to SGSN, msg length 4 +00 00 01 02 + +result ([empty]) = 4 ===== NS protocol test END -- 1.7.9.5
This adds tests for the gprs_ns_sendmsg() function. For this it merges back functions from the gbproxy test. Sponsored-by: On-Waves ehf --- tests/gb/gprs_ns_test.c | 312 ++++++++++++++++++++++++++++++++++++++++++---- tests/gb/gprs_ns_test.ok | 159 +++++++++++++++++++---- 2 files changed, 418 insertions(+), 53 deletions(-) diff --git a/tests/gb/gprs_ns_test.c b/tests/gb/gprs_ns_test.c index d7b769d..38c7d1f 100644 --- a/tests/gb/gprs_ns_test.c +++ b/tests/gb/gprs_ns_test.c @@ -26,6 +26,155 @@ #include <osmocom/gprs/gprs_ns.h> #include <osmocom/gprs/gprs_bssgp.h> +#define REMOTE_BSS_ADDR 0x01020304 +#define REMOTE_SGSN_ADDR 0x05060708 + +#define SGSN_NSEI 0x0100 + +static int gprs_process_message(struct gprs_ns_inst *nsi, const char *text, + struct sockaddr_in *peer, const unsigned char* data, + size_t data_len); + +static void send_ns_reset(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr, + enum ns_cause cause, uint16_t nsvci, uint16_t nsei) +{ + /* GPRS Network Service, PDU type: NS_RESET, + */ + unsigned char msg[12] = { + 0x02, 0x00, 0x81, 0x01, 0x01, 0x82, 0x11, 0x22, + 0x04, 0x82, 0x11, 0x22 + }; + + msg[3] = cause; + msg[6] = nsvci / 256; + msg[7] = nsvci % 256; + msg[10] = nsei / 256; + msg[11] = nsei % 256; + + gprs_process_message(nsi, "RESET", src_addr, msg, sizeof(msg)); +} + +static void send_ns_reset_ack(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr, + uint16_t nsvci, uint16_t nsei) +{ + /* GPRS Network Service, PDU type: NS_RESET_ACK, + */ + unsigned char msg[9] = { + 0x03, 0x01, 0x82, 0x11, 0x22, + 0x04, 0x82, 0x11, 0x22 + }; + + msg[3] = nsvci / 256; + msg[4] = nsvci % 256; + msg[7] = nsei / 256; + msg[8] = nsei % 256; + + gprs_process_message(nsi, "RESET_ACK", src_addr, msg, sizeof(msg)); +} + +static void send_ns_alive(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr) +{ + /* GPRS Network Service, PDU type: NS_ALIVE */ + unsigned char msg[1] = { + 0x0a + }; + + gprs_process_message(nsi, "ALIVE", src_addr, msg, sizeof(msg)); +} + +static void send_ns_alive_ack(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr) +{ + /* GPRS Network Service, PDU type: NS_ALIVE_ACK */ + unsigned char msg[1] = { + 0x0b + }; + + gprs_process_message(nsi, "ALIVE_ACK", src_addr, msg, sizeof(msg)); +} + +static void send_ns_unblock(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr) +{ + /* GPRS Network Service, PDU type: NS_UNBLOCK */ + unsigned char msg[1] = { + 0x06 + }; + + gprs_process_message(nsi, "UNBLOCK", src_addr, msg, sizeof(msg)); +} + +static void send_ns_unblock_ack(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr) +{ + /* GPRS Network Service, PDU type: NS_UNBLOCK_ACK */ + unsigned char msg[1] = { + 0x07 + }; + + gprs_process_message(nsi, "UNBLOCK_ACK", src_addr, msg, sizeof(msg)); +} + +static void send_ns_unitdata(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr, + uint16_t nsbvci, + const unsigned char *bssgp_msg, size_t bssgp_msg_size) +{ + /* GPRS Network Service, PDU type: NS_UNITDATA */ + unsigned char msg[4096] = { + 0x00, 0x00, 0x00, 0x00 + }; + + OSMO_ASSERT(bssgp_msg_size <= sizeof(msg) - 4); + + msg[2] = nsbvci / 256; + msg[3] = nsbvci % 256; + memcpy(msg + 4, bssgp_msg, bssgp_msg_size); + + gprs_process_message(nsi, "UNITDATA", src_addr, msg, bssgp_msg_size + 4); +} + +static void send_bssgp_reset(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr, + uint16_t bvci) +{ + /* GPRS Network Service, PDU type: NS_UNITDATA, BVCI 0 + * BSSGP RESET */ + unsigned char msg[22] = { + 0x22, 0x04, 0x82, 0x4a, + 0x2e, 0x07, 0x81, 0x08, 0x08, 0x88, 0x10, 0x20, + 0x30, 0x40, 0x50, 0x60, 0x10, 0x00 + }; + + msg[3] = bvci / 256; + msg[4] = bvci % 256; + + send_ns_unitdata(nsi, src_addr, 0, msg, sizeof(msg)); +} + +static void setup_ns(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr, + uint16_t nsvci, uint16_t nsei) +{ + printf("Setup NS-VC: remote 0x%08x:%d, " + "NSVCI 0x%04x(%d), NSEI 0x%04x(%d)\n\n", + ntohl(src_addr->sin_addr.s_addr), ntohs(src_addr->sin_port), + nsvci, nsvci, nsei, nsei); + + send_ns_reset(nsi, src_addr, NS_CAUSE_OM_INTERVENTION, nsvci, nsei); + send_ns_alive(nsi, src_addr); + send_ns_unblock(nsi, src_addr); + send_ns_alive_ack(nsi, src_addr); +} + +static void setup_bssgp(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr, + uint16_t bvci) __attribute__((__unused__)); + +static void setup_bssgp(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr, + uint16_t bvci) +{ + printf("Setup BSSGP: remote 0x%08x:%d, " + "BVCI 0x%04x(%d)\n\n", + ntohl(src_addr->sin_addr.s_addr), ntohs(src_addr->sin_port), + bvci, bvci); + + send_bssgp_reset(nsi, src_addr, bvci); +} + /* GPRS Network Service, PDU type: NS_RESET, * Cause: O&M intervention, NS VCI: 0x1122, NSEI 0x1122 */ @@ -110,18 +259,45 @@ ssize_t sendto(int sockfd, const void *buf, size_t len, int flags, typedef ssize_t (*sendto_t)(int, const void *, size_t, int, const struct sockaddr *, socklen_t); static sendto_t real_sendto = NULL; + uint32_t dest_host = htonl(((struct sockaddr_in *)dest_addr)->sin_addr.s_addr); if (!real_sendto) real_sendto = dlsym(RTLD_NEXT, "sendto"); - if (((struct sockaddr_in *)dest_addr)->sin_addr.s_addr != htonl(0x01020304)) + if (dest_host == REMOTE_BSS_ADDR) + printf("MESSAGE to BSS, msg length %d\n%s\n\n", len, osmo_hexdump(buf, len)); + else if (dest_host == REMOTE_SGSN_ADDR) + printf("MESSAGE to SGSN, msg length %d\n%s\n\n", len, osmo_hexdump(buf, len)); + else return real_sendto(sockfd, buf, len, flags, dest_addr, addrlen); - printf("RESPONSE, msg length %d\n%s\n\n", len, osmo_hexdump(buf, len)); - return len; } +/* override */ +int gprs_ns_sendmsg(struct gprs_ns_inst *nsi, struct msgb *msg) +{ + typedef int (*gprs_ns_sendmsg_t)(struct gprs_ns_inst *nsi, struct msgb *msg); + static gprs_ns_sendmsg_t real_gprs_ns_sendmsg = NULL; + uint16_t bvci = msgb_bvci(msg); + uint16_t nsei = msgb_nsei(msg); + + unsigned char *buf = msg->data; + size_t len = msg->len; + + if (!real_gprs_ns_sendmsg) + real_gprs_ns_sendmsg = dlsym(RTLD_NEXT, "gprs_ns_sendmsg"); + + if (nsei == SGSN_NSEI) + printf("NS UNITDATA MESSAGE to SGSN, BVCI 0x%04x, msg length %d\n%s\n\n", + bvci, len, osmo_hexdump(buf, len)); + else + printf("NS UNITDATA MESSAGE to BSS, BVCI 0x%04x, msg length %d\n%s\n\n", + bvci, len, osmo_hexdump(buf, len)); + + return real_gprs_ns_sendmsg(nsi, msg); +} + static void dump_rate_ctr_group(FILE *stream, const char *prefix, struct rate_ctr_group *ctrg) { @@ -217,6 +393,34 @@ static int gprs_process_message(struct gprs_ns_inst *nsi, const char *text, stru return ret; } +static int gprs_send_message(struct gprs_ns_inst *nsi, const char *text, + uint16_t nsei, uint16_t bvci, + const unsigned char* data, size_t data_len) +{ + struct msgb *msg; + int ret; + if (data_len > NS_ALLOC_SIZE - NS_ALLOC_HEADROOM) { + fprintf(stderr, "message too long: %d\n", data_len); + return -1; + } + + msg = gprs_ns_msgb_alloc(); + memmove(msg->data, data, data_len); + msg->l2h = msg->data; + msgb_put(msg, data_len); + + msgb_nsei(msg) = nsei; + msgb_bvci(msg) = bvci; + + printf("SENDING %s to NSEI 0x%04x, BVCI 0x%04x\n", text, nsei, bvci); + + ret = gprs_ns_sendmsg(nsi, msg); + + printf("result (%s) = %d\n\n", text, ret); + + return ret; +} + static void gprs_dump_nsi(struct gprs_ns_inst *nsi) { struct gprs_nsvc *nsvc; @@ -224,71 +428,65 @@ static void gprs_dump_nsi(struct gprs_ns_inst *nsi) printf("Current NS-VCIs:\n"); llist_for_each_entry(nsvc, &nsi->gprs_nsvcs, list) { struct sockaddr_in *peer = &(nsvc->ip.bts_addr); - printf(" VCI 0x%04x, NSEI 0x%04x, peer 0x%08x:%d\n", + printf(" VCI 0x%04x, NSEI 0x%04x, peer 0x%08x:%d%s%s\n", nsvc->nsvci, nsvc->nsei, - ntohl(peer->sin_addr.s_addr), ntohs(peer->sin_port) + ntohl(peer->sin_addr.s_addr), ntohs(peer->sin_port), + nsvc->state & NSE_S_BLOCKED ? ", blocked" : "", + nsvc->state & NSE_S_ALIVE ? "" : ", dead" ); dump_rate_ctr_group(stdout, " ", nsvc->ctrg); } printf("\n"); } -static void test_ns() +static void test_bss_port_changes() { struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, NULL); struct sockaddr_in peer[4] = {{0},}; peer[0].sin_family = AF_INET; peer[0].sin_port = htons(1111); - peer[0].sin_addr.s_addr = htonl(0x01020304); + peer[0].sin_addr.s_addr = htonl(REMOTE_BSS_ADDR); peer[1].sin_family = AF_INET; peer[1].sin_port = htons(2222); - peer[1].sin_addr.s_addr = htonl(0x01020304); + peer[1].sin_addr.s_addr = htonl(REMOTE_BSS_ADDR); peer[2].sin_family = AF_INET; peer[2].sin_port = htons(3333); - peer[2].sin_addr.s_addr = htonl(0x01020304); + peer[2].sin_addr.s_addr = htonl(REMOTE_BSS_ADDR); peer[3].sin_family = AF_INET; peer[3].sin_port = htons(4444); - peer[3].sin_addr.s_addr = htonl(0x01020304); + peer[3].sin_addr.s_addr = htonl(REMOTE_BSS_ADDR); - gprs_process_message(nsi, "RESET", &peer[0], - gprs_ns_reset, sizeof(gprs_ns_reset)); + printf("--- Setup, send BSSGP RESET ---\n\n"); + + setup_ns(nsi, &peer[0], 0x1122, 0x1122); gprs_dump_nsi(nsi); - gprs_process_message(nsi, "ALIVE", &peer[0], - gprs_ns_alive, sizeof(gprs_ns_alive)); - gprs_process_message(nsi, "UNBLOCK", &peer[0], - gprs_ns_unblock, sizeof(gprs_ns_unblock)); gprs_process_message(nsi, "BSSGP RESET", &peer[0], gprs_bssgp_reset, sizeof(gprs_bssgp_reset)); printf("--- Peer port changes, RESET, message remains unchanged ---\n\n"); - gprs_process_message(nsi, "RESET", &peer[1], - gprs_ns_reset, sizeof(gprs_ns_reset)); + send_ns_reset(nsi, &peer[1], NS_CAUSE_OM_INTERVENTION, 0x1122, 0x1122); gprs_dump_nsi(nsi); printf("--- Peer port changes, RESET, VCI changes ---\n\n"); - gprs_process_message(nsi, "RESET", &peer[2], - gprs_ns_reset_vci2, sizeof(gprs_ns_reset_vci2)); + send_ns_reset(nsi, &peer[2], NS_CAUSE_OM_INTERVENTION, 0x3344, 0x1122); gprs_dump_nsi(nsi); printf("--- Peer port changes, RESET, NSEI changes ---\n\n"); - gprs_process_message(nsi, "RESET", &peer[3], - gprs_ns_reset_nsei2, sizeof(gprs_ns_reset_nsei2)); + send_ns_reset(nsi, &peer[3], NS_CAUSE_OM_INTERVENTION, 0x1122, 0x3344); gprs_dump_nsi(nsi); printf("--- Peer port 3333, RESET, VCI is changed back ---\n\n"); - gprs_process_message(nsi, "RESET", &peer[2], - gprs_ns_reset, sizeof(gprs_ns_reset)); + send_ns_reset(nsi, &peer[2], NS_CAUSE_OM_INTERVENTION, 0x1122, 0x1122); gprs_dump_nsi(nsi); printf("--- Peer port 4444, RESET, NSEI is changed back ---\n\n"); - gprs_process_message(nsi, "RESET", &peer[3], - gprs_ns_reset, sizeof(gprs_ns_reset)); + send_ns_reset(nsi, &peer[3], NS_CAUSE_OM_INTERVENTION, 0x1122, 0x1122); gprs_dump_nsi(nsi); gprs_ns_destroy(nsi); @@ -296,6 +494,65 @@ static void test_ns() } +static void test_sgsn_output() +{ + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, NULL); + struct sockaddr_in sgsn_peer= {0}; + + sgsn_peer.sin_family = AF_INET; + sgsn_peer.sin_port = htons(32000); + sgsn_peer.sin_addr.s_addr = htonl(REMOTE_SGSN_ADDR); + + gprs_dump_nsi(nsi); + + printf("--- Send message to SGSN ---\n\n"); + + gprs_send_message(nsi, "BSSGP RESET", SGSN_NSEI, 0, + gprs_bssgp_reset+4, sizeof(gprs_bssgp_reset)-4); + + printf("--- Setup dead connection to SGSN ---\n\n"); + + gprs_ns_nsip_connect(nsi, &sgsn_peer, SGSN_NSEI, SGSN_NSEI+1); + gprs_dump_nsi(nsi); + + printf("--- Send message to SGSN ---\n\n"); + + gprs_send_message(nsi, "BSSGP RESET", SGSN_NSEI, 0, + gprs_bssgp_reset+4, sizeof(gprs_bssgp_reset)-4); + + printf("--- Make connection to SGSN alive ---\n\n"); + + send_ns_reset_ack(nsi, &sgsn_peer, SGSN_NSEI+1, SGSN_NSEI); + send_ns_alive_ack(nsi, &sgsn_peer); + gprs_dump_nsi(nsi); + + printf("--- Send message to SGSN ---\n\n"); + + gprs_send_message(nsi, "BSSGP RESET", SGSN_NSEI, 0, + gprs_bssgp_reset+4, sizeof(gprs_bssgp_reset)-4); + + printf("--- Unblock connection to SGSN ---\n\n"); + + send_ns_unblock_ack(nsi, &sgsn_peer); + send_ns_alive(nsi, &sgsn_peer); + gprs_dump_nsi(nsi); + + printf("--- Send message to SGSN ---\n\n"); + + gprs_send_message(nsi, "BSSGP RESET", SGSN_NSEI, 0, + gprs_bssgp_reset+4, sizeof(gprs_bssgp_reset)-4); + + printf("--- Send empty message with BVCI to SGSN ---\n\n"); + + gprs_send_message(nsi, "[empty]", SGSN_NSEI, 0x0102, + gprs_bssgp_reset, 0); + + + gprs_ns_destroy(nsi); + nsi = NULL; +} + + int bssgp_prim_cb(struct osmo_prim_hdr *oph, void *ctx) { return -1; @@ -311,7 +568,8 @@ int main(int argc, char **argv) osmo_signal_register_handler(SS_L_NS, &test_signal, NULL); printf("===== NS protocol test START\n"); - test_ns(); + test_bss_port_changes(); + test_sgsn_output(); printf("===== NS protocol test END\n\n"); exit(EXIT_SUCCESS); diff --git a/tests/gb/gprs_ns_test.ok b/tests/gb/gprs_ns_test.ok index 7be84ef..5dc1e92 100644 --- a/tests/gb/gprs_ns_test.ok +++ b/tests/gb/gprs_ns_test.ok @@ -1,23 +1,24 @@ ===== NS protocol test START +--- Setup, send BSSGP RESET --- + +Setup NS-VC: remote 0x01020304:1111, NSVCI 0x1122(4386), NSEI 0x1122(4386) + PROCESSING RESET from 0x01020304:1111 02 00 81 01 01 82 11 22 04 82 11 22 ==> got signal NS_RESET, NS-VC 0x1122/1.2.3.4:1111 -RESPONSE, msg length 9 +MESSAGE to BSS, msg length 9 03 01 82 11 22 04 82 11 22 -RESPONSE, msg length 1 +MESSAGE to BSS, msg length 1 0a result (RESET) = 9 -Current NS-VCIs: - VCI 0x1122, NSEI 0x1122, peer 0x01020304:1111 - PROCESSING ALIVE from 0x01020304:1111 0a -RESPONSE, msg length 1 +MESSAGE to BSS, msg length 1 0b result (ALIVE) = 1 @@ -26,11 +27,19 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 ==> got signal NS_UNBLOCK, NS-VC 0x1122/1.2.3.4:1111 -RESPONSE, msg length 1 +MESSAGE to BSS, msg length 1 07 result (UNBLOCK) = 1 +PROCESSING ALIVE_ACK from 0x01020304:1111 +0b + +result (ALIVE_ACK) = 0 + +Current NS-VCIs: + VCI 0x1122, NSEI 0x1122, peer 0x01020304:1111 + PROCESSING BSSGP RESET from 0x01020304:1111 00 00 00 00 22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 @@ -45,16 +54,16 @@ PROCESSING RESET from 0x01020304:2222 02 00 81 01 01 82 11 22 04 82 11 22 ==> got signal NS_RESET, NS-VC 0x1122/1.2.3.4:2222 -RESPONSE, msg length 9 +MESSAGE to BSS, msg length 9 03 01 82 11 22 04 82 11 22 -RESPONSE, msg length 1 +MESSAGE to BSS, msg length 1 0a result (RESET) = 9 Current NS-VCIs: - VCI 0x1122, NSEI 0x1122, peer 0x01020304:2222 + VCI 0x1122, NSEI 0x1122, peer 0x01020304:2222, blocked --- Peer port changes, RESET, VCI changes --- @@ -62,17 +71,17 @@ PROCESSING RESET from 0x01020304:3333 02 00 81 01 01 82 33 44 04 82 11 22 ==> got signal NS_RESET, NS-VC 0x3344/1.2.3.4:3333 -RESPONSE, msg length 9 +MESSAGE to BSS, msg length 9 03 01 82 33 44 04 82 11 22 -RESPONSE, msg length 1 +MESSAGE to BSS, msg length 1 0a result (RESET) = 9 Current NS-VCIs: - VCI 0x3344, NSEI 0x1122, peer 0x01020304:3333 - VCI 0x1122, NSEI 0x1122, peer 0x01020304:2222 + VCI 0x3344, NSEI 0x1122, peer 0x01020304:3333, blocked + VCI 0x1122, NSEI 0x1122, peer 0x01020304:2222, blocked --- Peer port changes, RESET, NSEI changes --- @@ -80,17 +89,17 @@ PROCESSING RESET from 0x01020304:4444 02 00 81 01 01 82 11 22 04 82 33 44 ==> got signal NS_RESET, NS-VC 0x1122/1.2.3.4:4444 -RESPONSE, msg length 9 +MESSAGE to BSS, msg length 9 03 01 82 11 22 04 82 33 44 -RESPONSE, msg length 1 +MESSAGE to BSS, msg length 1 0a result (RESET) = 9 Current NS-VCIs: - VCI 0x3344, NSEI 0x1122, peer 0x01020304:3333 - VCI 0x1122, NSEI 0x3344, peer 0x01020304:4444 + VCI 0x3344, NSEI 0x1122, peer 0x01020304:3333, blocked + VCI 0x1122, NSEI 0x3344, peer 0x01020304:4444, blocked NS-VC changed NSEI : 1 --- Peer port 3333, RESET, VCI is changed back --- @@ -100,17 +109,17 @@ PROCESSING RESET from 0x01020304:3333 ==> got signal NS_REPLACED: 0x1122/1.2.3.4:4444 -> 0x3344/1.2.3.4:3333 ==> got signal NS_RESET, NS-VC 0x1122/1.2.3.4:3333 -RESPONSE, msg length 9 +MESSAGE to BSS, msg length 9 03 01 82 11 22 04 82 11 22 -RESPONSE, msg length 1 +MESSAGE to BSS, msg length 1 0a result (RESET) = 9 Current NS-VCIs: - VCI 0x3344, NSEI 0x1122, peer 0x00000000:0 - VCI 0x1122, NSEI 0x1122, peer 0x01020304:3333 + VCI 0x3344, NSEI 0x1122, peer 0x00000000:0, blocked + VCI 0x1122, NSEI 0x1122, peer 0x01020304:3333, blocked NS-VC replaced other count: 1 NS-VC changed NSEI : 2 @@ -120,19 +129,117 @@ PROCESSING RESET from 0x01020304:4444 02 00 81 01 01 82 11 22 04 82 11 22 ==> got signal NS_RESET, NS-VC 0x1122/1.2.3.4:4444 -RESPONSE, msg length 9 +MESSAGE to BSS, msg length 9 03 01 82 11 22 04 82 11 22 -RESPONSE, msg length 1 +MESSAGE to BSS, msg length 1 0a result (RESET) = 9 Current NS-VCIs: - VCI 0x3344, NSEI 0x1122, peer 0x00000000:0 - VCI 0x1122, NSEI 0x1122, peer 0x01020304:4444 + VCI 0x3344, NSEI 0x1122, peer 0x00000000:0, blocked + VCI 0x1122, NSEI 0x1122, peer 0x01020304:4444, blocked NS-VC replaced other count: 1 NS-VC changed NSEI : 2 +Current NS-VCIs: + +--- Send message to SGSN --- + +SENDING BSSGP RESET to NSEI 0x0100, BVCI 0x0000 +NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 +22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 + +result (BSSGP RESET) = -22 + +--- Setup dead connection to SGSN --- + +MESSAGE to SGSN, msg length 12 +02 00 81 01 01 82 01 01 04 82 01 00 + +Current NS-VCIs: + VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000, blocked, dead + +--- Send message to SGSN --- + +SENDING BSSGP RESET to NSEI 0x0100, BVCI 0x0000 +NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 +22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 + +MESSAGE to SGSN, msg length 22 +00 00 00 00 22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 + +result (BSSGP RESET) = 22 + +--- Make connection to SGSN alive --- + +PROCESSING RESET_ACK from 0x05060708:32000 +03 01 82 01 01 04 82 01 00 + +MESSAGE to SGSN, msg length 1 +0a + +result (RESET_ACK) = 1 + +PROCESSING ALIVE_ACK from 0x05060708:32000 +0b + +MESSAGE to SGSN, msg length 1 +06 + +result (ALIVE_ACK) = 1 + +Current NS-VCIs: + VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000, blocked + NS-VC Block count : 1 + +--- Send message to SGSN --- + +SENDING BSSGP RESET to NSEI 0x0100, BVCI 0x0000 +NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 +22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 + +MESSAGE to SGSN, msg length 22 +00 00 00 00 22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 + +result (BSSGP RESET) = 22 + +--- Unblock connection to SGSN --- + +PROCESSING UNBLOCK_ACK from 0x05060708:32000 +07 + +==> got signal NS_UNBLOCK, NS-VC 0x0101/5.6.7.8:32000 +result (UNBLOCK_ACK) = 0 + +PROCESSING ALIVE from 0x05060708:32000 +0a + +MESSAGE to SGSN, msg length 1 +0b + +result (ALIVE) = 1 + +Current NS-VCIs: + VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000 + NS-VC Block count : 1 + +--- Send message to SGSN --- + +SENDING BSSGP RESET to NSEI 0x0100, BVCI 0x0000 +NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 +22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 + +result (BSSGP RESET) = -16 + +--- Send empty message with BVCI to SGSN --- + +SENDING [empty] to NSEI 0x0100, BVCI 0x0102 +NS UNITDATA MESSAGE to SGSN, BVCI 0x0102, msg length 0 + + +result ([empty]) = -16 + ===== NS protocol test END -- 1.7.9.5
The state matching condition is inverted. This is corrected by this fix. Sponsored-by: On-Waves ehf --- src/gb/gprs_ns.c | 4 ++-- tests/gb/gprs_ns_test.ok | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index bdc7ae3..6a35ad3 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -158,8 +158,8 @@ static struct gprs_nsvc *gprs_active_nsvc_by_nsei(struct gprs_ns_inst *nsi, struct gprs_nsvc *nsvc; llist_for_each_entry(nsvc, &nsi->gprs_nsvcs, list) { if (nsvc->nsei == nsei) { - if (nsvc->state & NSE_S_BLOCKED || - !(nsvc->state & NSE_S_ALIVE)) + if (!(nsvc->state & NSE_S_BLOCKED) && + nsvc->state & NSE_S_ALIVE) return nsvc; } } diff --git a/tests/gb/gprs_ns_test.ok b/tests/gb/gprs_ns_test.ok index 5dc1e92..424d681 100644 --- a/tests/gb/gprs_ns_test.ok +++ b/tests/gb/gprs_ns_test.ok @@ -167,10 +167,7 @@ SENDING BSSGP RESET to NSEI 0x0100, BVCI 0x0000 NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 -MESSAGE to SGSN, msg length 22 -00 00 00 00 22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 - -result (BSSGP RESET) = 22 +result (BSSGP RESET) = -16 --- Make connection to SGSN alive --- @@ -200,10 +197,7 @@ SENDING BSSGP RESET to NSEI 0x0100, BVCI 0x0000 NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 -MESSAGE to SGSN, msg length 22 -00 00 00 00 22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 - -result (BSSGP RESET) = 22 +result (BSSGP RESET) = -16 --- Unblock connection to SGSN --- @@ -231,7 +225,10 @@ SENDING BSSGP RESET to NSEI 0x0100, BVCI 0x0000 NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 -result (BSSGP RESET) = -16 +MESSAGE to SGSN, msg length 22 +00 00 00 00 22 04 82 4a 2e 07 81 08 08 88 10 20 30 40 50 60 10 00 + +result (BSSGP RESET) = 22 --- Send empty message with BVCI to SGSN --- @@ -239,7 +236,10 @@ SENDING [empty] to NSEI 0x0100, BVCI 0x0102 NS UNITDATA MESSAGE to SGSN, BVCI 0x0102, msg length 0 -result ([empty]) = -16 +MESSAGE to SGSN, msg length 4 +00 00 01 02 + +result ([empty]) = 4 ===== NS protocol test END -- 1.7.9.5
participants (1)
-
Jacob Erlbeck