diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2013-06-25 11:44:01 +0200 |
---|---|---|
committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-07-31 16:36:40 +0200 |
commit | ddf191eafc079cb26e2956a611d59e5235de1798 (patch) | |
tree | f1c012375d24c6f58e14c8606a11fb671d3b1da2 /openbsc/src/osmo-bsc_nat/bsc_nat_rewrite.c | |
parent | 85d3b34ed2c3b627fca50c82abe426b7239b62a3 (diff) |
nat: Allow to use the prefix lookup to rewrite numbers
* Increase the rewritten rule to five digits (this is the easiest
for the unit test). This will add another 40kb to the runtime size.
* Create a unit test that tests adding and removing the prefix rules.
* Use the regexp match to replace from one package
Diffstat (limited to 'openbsc/src/osmo-bsc_nat/bsc_nat_rewrite.c')
-rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_nat_rewrite.c | 45 |
1 files changed, 38 insertions, 7 deletions
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_rewrite.c b/openbsc/src/osmo-bsc_nat/bsc_nat_rewrite.c index 06071c475..5984d962d 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_rewrite.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_rewrite.c @@ -27,6 +27,7 @@ #include <openbsc/gsm_data.h> #include <openbsc/debug.h> #include <openbsc/ipaccess.h> +#include <openbsc/nat_rewrite_trie.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/talloc.h> @@ -37,9 +38,30 @@ #include <osmocom/sccp/sccp.h> +static char *trie_lookup(struct nat_rewrite *trie, const char *number, + regoff_t off, void *ctx) +{ + struct nat_rewrite_rule *rule; + + if (!trie) { + LOGP(DNAT, LOGL_ERROR, + "Asked to do a table lookup but no table.\n"); + return NULL; + } + + rule = nat_rewrite_lookup(trie, number); + if (!rule) { + LOGP(DNAT, LOGL_DEBUG, + "Couldn't find a prefix rule for %s\n", number); + return NULL; + } + + return talloc_asprintf(ctx, "%s%s", rule->rewrite, &number[off]); +} + static char *match_and_rewrite_number(void *ctx, const char *number, - const char *imsi, - struct llist_head *list) + const char *imsi, struct llist_head *list, + struct nat_rewrite *trie) { struct bsc_nat_num_rewr_entry *entry; char *new_number = NULL; @@ -53,11 +75,17 @@ static char *match_and_rewrite_number(void *ctx, const char *number, continue; /* this regexp matches... */ - if (regexec(&entry->num_reg, number, 2, matches, 0) == 0 && - matches[1].rm_eo != -1) - new_number = talloc_asprintf(ctx, "%s%s", + if (regexec(&entry->num_reg, number, 2, matches, 0) == 0 + && matches[1].rm_eo != -1) { + if (entry->is_prefix_lookup) + new_number = trie_lookup(trie, number, + matches[1].rm_so, ctx); + else + new_number = talloc_asprintf(ctx, "%s%s", entry->replace, &number[matches[1].rm_so]); + } + if (new_number) break; } @@ -86,7 +114,7 @@ static char *rewrite_isdn_number(struct bsc_nat *nat, void *ctx, const char *ims } return match_and_rewrite_number(ctx, number, - imsi, &nat->num_rewr); + imsi, &nat->num_rewr, nat->num_rewr_trie); } @@ -261,7 +289,7 @@ static char *sms_new_dest_nr(struct bsc_nat *nat, void *ctx, const char *imsi, const char *dest_nr) { return match_and_rewrite_number(ctx, dest_nr, imsi, - &nat->sms_num_rewr); + &nat->sms_num_rewr, NULL); } /** @@ -600,6 +628,9 @@ void bsc_nat_num_rewr_entry_adapt(void *ctx, struct llist_head *head, continue; } + if (strcmp("prefix_lookup", entry->replace) == 0) + entry->is_prefix_lookup = 1; + /* we will now build a regexp string */ if (cfg_entry->mcc[0] == '^') { regexp = talloc_strdup(entry, cfg_entry->mcc); |