aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@gnumonks.org>2011-05-07 13:11:20 +0200
committerPablo Neira Ayuso <pablo@gnumonks.org>2011-05-07 13:15:11 +0200
commitab46cf38d49164e3a99912d534719e63478964ab (patch)
tree46e9f1a17146d491daca981544972769c9740d0e
parentc0d17f22663ba78f1620043316ac7d374ff45b86 (diff)
src: rename msg_entr* to osmo_config_*
Summary of changes: s/msg_entry_parse/osmo_config_list_parse/g s/msg_entry/osmo_config_entry/g s/msg_entries/osmo_config_list/g
-rw-r--r--openbsc/include/openbsc/bsc_nat.h2
-rw-r--r--openbsc/src/osmo-bsc_nat/bsc_nat_utils.c2
-rw-r--r--openbsc/src/osmo-bsc_nat/bsc_nat_vty.c2
-rw-r--r--openbsc/tests/bsc-nat/bsc_nat_test.c4
4 files changed, 5 insertions, 5 deletions
diff --git a/openbsc/include/openbsc/bsc_nat.h b/openbsc/include/openbsc/bsc_nat.h
index 0894f2516..c3f32eb35 100644
--- a/openbsc/include/openbsc/bsc_nat.h
+++ b/openbsc/include/openbsc/bsc_nat.h
@@ -267,7 +267,7 @@ struct bsc_nat {
/* number rewriting */
char *num_rewr_name;
- struct msg_entries *num_rewr;
+ struct osmo_config_list *num_rewr;
/* USSD messages we want to match */
char *ussd_lst_name;
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
index 8765f27fb..dd32c752a 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
@@ -809,7 +809,7 @@ struct msgb *bsc_nat_rewrite_setup(struct bsc_nat *nat, struct msgb *msg, struct
uint8_t msg_type, proto;
unsigned int payload_len;
struct gsm_mncc_number called;
- struct msg_entry *entry;
+ struct osmo_config_entry *entry;
char *new_number = NULL;
struct msgb *out, *sccp;
uint8_t *outptr;
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
index a115fadbf..f56ebb8da 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
@@ -462,7 +462,7 @@ DEFUN(cfg_nat_number_rewrite,
if (_nat->num_rewr_name) {
if (_nat->num_rewr)
talloc_free(_nat->num_rewr);
- _nat->num_rewr = msg_entry_parse(_nat, _nat->num_rewr_name);
+ _nat->num_rewr = osmo_config_list_parse(_nat, _nat->num_rewr_name);
return _nat->num_rewr == NULL ? CMD_WARNING : CMD_SUCCESS;
} else {
if (_nat->num_rewr)
diff --git a/openbsc/tests/bsc-nat/bsc_nat_test.c b/openbsc/tests/bsc-nat/bsc_nat_test.c
index ec3a532f5..6ec22c501 100644
--- a/openbsc/tests/bsc-nat/bsc_nat_test.c
+++ b/openbsc/tests/bsc-nat/bsc_nat_test.c
@@ -844,8 +844,8 @@ static void test_setup_rewrite()
struct bsc_nat *nat = bsc_nat_alloc();
/* a fake list */
- struct msg_entries entries;
- struct msg_entry entry;
+ struct osmo_config_list entries;
+ struct osmo_config_entry entry;
INIT_LLIST_HEAD(&entries.entry);
entry.mcc = "274";