paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-10-23 08:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

nat: Fix error in get_next_free_bsc_id

Browse Source 
The new function now mimcis the behaviour of
assign_src_local_reference from bsc_sccp.c
This commit is contained in:
Daniel Willmann
2011-07-16 21:42:53 +02:00
committed by Holger Hans Peter Freyther
parent 7c3298af9e
commit e54db171ee
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
openbsc/src/osmo-bsc_nat/bsc_nat.c
View File

@@ -1534,34 +1534,39 @@ static struct vty_app_info vty_info = {
.is_config_node = bsc_vty_is_config_node, .is_config_node = bsc_vty_is_config_node,
}; };
static int bsc_id_unused(int id, struct bsc_connection *bsc)
{
struct bsc_cmd_list *pending;
llist_for_each_entry(pending, &bsc->cmd_pending, list_entry) {
if (pending->nat_id == id)
return 0;
}
return 1;
}
#define NAT_MAX_CTRL_ID 65535
static int get_next_free_bsc_id(struct bsc_connection *bsc) static int get_next_free_bsc_id(struct bsc_connection *bsc)
{ {
int new_id, overflow = 0; int new_id, overflow = 0;
struct bsc_cmd_list *pending;
new_id = bsc->last_id; new_id = bsc->last_id;
do { do {
new_id++; new_id++;
if (new_id <= 0) { if (new_id == NAT_MAX_CTRL_ID) {
new_id = 1; new_id = 1;
overflow++; overflow++;
} }
llist_for_each_entry(pending, &bsc->cmd_pending, list_entry) { if (bsc_id_unused(new_id, bsc)) {
if (pending->nat_id == new_id) bsc->last_id = new_id;
continue; return new_id;
} }
} while (overflow != 2);
/* ID is not in use */ return -1;
break;
} while ((new_id != bsc->last_id) && (overflow < 2));
if ((new_id == bsc->last_id) || (overflow == 2)) {
return -1;
} else {
bsc->last_id = new_id;
return new_id;
}
} }
static void pending_timeout_cb(void *data) static void pending_timeout_cb(void *data)