Rework NS configuration over the info indication

Add support of the second NSVC in the info indication.
Add support to update a previous NS configuration.
Allow to update of a NS-VC while the NSE is still available over the
second.

Depends-on: I917f25ebd1239eae5855d973ced15b93731e33a0 (libosmocore)
Depends-on: I3a0cd305fd73b3cb9ec70246ec15ac70b83e57f2 (libosmocore)
Depends-on: I5a2bb95d05d06d909347e2fb084a446ead888cb3 (libosmocore)
Depends-on: I54f110acc3acccb362f6e554324d08cc42b7c328 (libosmocore)
Depends-on: Ia00753a64b7622a0864341f51ea49b6963543755 (libosmocore)
Depends-on: Ic8f6f8aca10da23a18fab8870be7806065a34b47 (libosmocore)
Depends-on: I5f67e6a9bf4cb322bd169061fee0a528012ed54d (libosmocore)
Change-Id: I589ebaa2a2b7de55b7e4e975d8fd6412dd5f214b
diff --git a/tests/emu/pcu_emu.cpp b/tests/emu/pcu_emu.cpp
index 98da13e..853fcb9 100644
--- a/tests/emu/pcu_emu.cpp
+++ b/tests/emu/pcu_emu.cpp
@@ -94,6 +94,8 @@
 {
 	struct gprs_bssgp_pcu *pcu;
 	struct osmo_sockaddr local, remote;
+	uint16_t nsvci = 20;
+	uint16_t nsei = 20;
 
 	local.u.sin.sin_family = AF_INET;
 	local.u.sin.sin_addr.s_addr = 0;
@@ -104,8 +106,7 @@
 	remote.u.sin.sin_port = htons(sgsn_port);
 
 	pcu = gprs_bssgp_init(bts, 20, 20, 901, 99, false, 1, 0, 0);
-	gprs_nsvc_create_and_connect(bts, &local, &remote,
-				     20, 20);
+	gprs_ns_config(bts, nsei, &local, &remote, &nsvci, 1);
 
 	pcu->on_unblock_ack = bvci_unblocked;
 	pcu->on_dl_unit_data = bssgp_data;