cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

gprs/test: Remove verbose parameter of gbprox_dump_* functions 

This parameter is not used (the methods are always called with an
argument of 1 in the third position). Thus the parameter is removed
completely.

Sponsored-by: On-Waves ehf
This commit is contained in:
Jacob Erlbeck 2014-07-07 10:45:59 +02:00 committed by Holger Hans Peter Freyther
parent b115cb6655
commit b32d3c041b
3 changed files with 30 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openbsc/include/openbsc/gb_proxy.h
View File

@ -37,7 +37,7 @@ int gbprox_signal(unsigned int subsys, unsigned int signal,
/* Reset all persistent NS-VC's */
int gbprox_reset_persistent_nsvcs(struct gprs_ns_inst *nsi);
int gbprox_dump_global(FILE *stream, int indent, int verbose);
int gbprox_dump_peers(FILE *stream, int indent, int verbose);
int gbprox_dump_global(FILE *stream, int indent);
int gbprox_dump_peers(FILE *stream, int indent);
void gbprox_reset();
#endif

10
openbsc/src/gprs/gb_proxy.c
View File

@ -806,7 +806,7 @@ int gbprox_signal(unsigned int subsys, unsigned int signal,
return 0;
}
int gbprox_dump_global(FILE *stream, int indent, int verbose)
int gbprox_dump_global(FILE *stream, int indent)
{
unsigned int i;
const struct rate_ctr_group_desc *desc;
@ -816,9 +816,6 @@ int gbprox_dump_global(FILE *stream, int indent, int verbose)
if (rc < 0)
return rc;
if (!verbose)
return 0;
desc = get_global_ctrg()->desc;
for (i = 0; i < desc->num_ctr; i++) {
@ -837,7 +834,7 @@ int gbprox_dump_global(FILE *stream, int indent, int verbose)
return 0;
}
int gbprox_dump_peers(FILE *stream, int indent, int verbose)
int gbprox_dump_peers(FILE *stream, int indent)
{
struct gbprox_peer *peer;
struct gprs_ra_id raid;
@ -862,9 +859,6 @@ int gbprox_dump_peers(FILE *stream, int indent, int verbose)
if (rc < 0)
return rc;
if (!verbose)
continue;
desc = peer->ctrg->desc;
for (i = 0; i < desc->num_ctr; i++) {

52
openbsc/tests/gbproxy/gbproxy_test.c
View File

@ -420,7 +420,7 @@ static void test_gbproxy()
setup_ns(nsi, &bss_peer[0], 0x1001, 0x1000);
setup_bssgp(nsi, &bss_peer[0], 0x1002);
gprs_dump_nsi(nsi);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
send_bssgp_reset_ack(nsi, &sgsn_peer, 0x1002);
@ -429,7 +429,7 @@ static void test_gbproxy()
setup_ns(nsi, &bss_peer[1], 0x2001, 0x2000);
setup_bssgp(nsi, &bss_peer[1], 0x2002);
gprs_dump_nsi(nsi);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
send_bssgp_reset_ack(nsi, &sgsn_peer, 0x2002);
@ -437,43 +437,43 @@ static void test_gbproxy()
setup_ns(nsi, &bss_peer[2], 0x1001, 0x1000);
gprs_dump_nsi(nsi);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
printf("--- Move BSS 2 to former BSS 1 port ---\n\n");
setup_ns(nsi, &bss_peer[0], 0x2001, 0x2000);
gprs_dump_nsi(nsi);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
printf("--- Move BSS 1 to current BSS 2 port ---\n\n");
setup_ns(nsi, &bss_peer[0], 0x2001, 0x2000);
gprs_dump_nsi(nsi);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
printf("--- Move BSS 2 to new port ---\n\n");
setup_ns(nsi, &bss_peer[3], 0x2001, 0x2000);
gprs_dump_nsi(nsi);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
printf("--- Move BSS 2 to former BSS 1 port ---\n\n");
setup_ns(nsi, &bss_peer[2], 0x2001, 0x2000);
gprs_dump_nsi(nsi);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
printf("--- Move BSS 1 to original BSS 1 port ---\n\n");
setup_ns(nsi, &bss_peer[0], 0x1001, 0x1000);
gprs_dump_nsi(nsi);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
printf("--- Reset BSS 1 with a new BVCI ---\n\n");
setup_bssgp(nsi, &bss_peer[0], 0x1012);
gprs_dump_nsi(nsi);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
send_bssgp_reset_ack(nsi, &sgsn_peer, 0x1012);
@ -481,7 +481,7 @@ static void test_gbproxy()
setup_bssgp(nsi, &bss_peer[0], 0x1002);
gprs_dump_nsi(nsi);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
send_bssgp_reset_ack(nsi, &sgsn_peer, 0x1002);
@ -489,7 +489,7 @@ static void test_gbproxy()
setup_bssgp(nsi, &bss_peer[0], 0x1002);
gprs_dump_nsi(nsi);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
send_bssgp_reset_ack(nsi, &sgsn_peer, 0x1002);
@ -521,9 +521,9 @@ static void test_gbproxy()
setup_bssgp(nsi, &bss_peer[2], 0x1002);
gprs_dump_nsi(nsi);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
gbprox_dump_global(stdout, 0, 1);
gbprox_dump_global(stdout, 0);
send_bssgp_reset_ack(nsi, &sgsn_peer, 0x1002);
@ -539,7 +539,7 @@ static void test_gbproxy()
send_ns_unitdata(nsi, NULL, &sgsn_peer, 0x10ff, (uint8_t *)"", 0);
gbprox_dump_global(stdout, 0, 1);
gbprox_dump_global(stdout, 0);
gprs_ns_destroy(nsi);
nsi = NULL;
@ -585,13 +585,13 @@ static void test_gbproxy_ident_changes()
setup_bssgp(nsi, &bss_peer[0], bvci[0]);
send_bssgp_reset_ack(nsi, &sgsn_peer, bvci[0]);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
printf("--- Setup BVCI 2 ---\n\n");
setup_bssgp(nsi, &bss_peer[0], bvci[1]);
send_bssgp_reset_ack(nsi, &sgsn_peer, bvci[1]);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
printf("--- Send message from BSS 1 to SGSN and back, BVCI 1 ---\n\n");
@ -612,13 +612,13 @@ static void test_gbproxy_ident_changes()
setup_bssgp(nsi, &bss_peer[0], bvci[0]);
send_bssgp_reset_ack(nsi, &sgsn_peer, bvci[0]);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
printf("--- Setup BVCI 3 ---\n\n");
setup_bssgp(nsi, &bss_peer[0], bvci[2]);
send_bssgp_reset_ack(nsi, &sgsn_peer, bvci[2]);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
printf("--- Send message from BSS 1 to SGSN and back, BVCI 1 ---\n\n");
@ -629,9 +629,9 @@ static void test_gbproxy_ident_changes()
" (should fail) ---\n\n");
send_ns_unitdata(nsi, NULL, &bss_peer[0], bvci[1], (uint8_t *)"", 0);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
send_ns_unitdata(nsi, NULL, &sgsn_peer, bvci[1], (uint8_t *)"", 0);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
printf("--- Send message from BSS 1 to SGSN and back, BVCI 3 ---\n\n");
@ -647,13 +647,13 @@ static void test_gbproxy_ident_changes()
setup_bssgp(nsi, &bss_peer[0], bvci[0]);
send_bssgp_reset_ack(nsi, &sgsn_peer, bvci[0]);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
printf("--- Setup BVCI 4 ---\n\n");
setup_bssgp(nsi, &bss_peer[0], bvci[3]);
send_bssgp_reset_ack(nsi, &sgsn_peer, bvci[3]);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
printf("--- Send message from BSS 1 to SGSN and back, BVCI 1 ---\n\n");
@ -664,9 +664,9 @@ static void test_gbproxy_ident_changes()
" (should fail) ---\n\n");
send_ns_unitdata(nsi, NULL, &bss_peer[0], bvci[1], (uint8_t *)"", 0);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
send_ns_unitdata(nsi, NULL, &sgsn_peer, bvci[1], (uint8_t *)"", 0);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_peers(stdout, 0);
printf("--- Send message from BSS 1 to SGSN and back, BVCI 3 ---\n\n");
@ -678,8 +678,8 @@ static void test_gbproxy_ident_changes()
send_ns_unitdata(nsi, NULL, &bss_peer[0], bvci[3], (uint8_t *)"", 0);
send_ns_unitdata(nsi, NULL, &sgsn_peer, bvci[3], (uint8_t *)"", 0);
gbprox_dump_global(stdout, 0, 1);
gbprox_dump_peers(stdout, 0, 1);
gbprox_dump_global(stdout, 0);
gbprox_dump_peers(stdout, 0);
gprs_ns_destroy(nsi);
nsi = NULL;