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

nat: Make the USSD number matching a regexp 

This allows to match multiple numbers and multiple patterns
This commit is contained in:
Holger Hans Peter Freyther 2011-04-01 17:32:21 +02:00
parent 9e7e55f164
commit a18b11602c
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openbsc/include/openbsc/bsc_nat.h
View File

@ -249,6 +249,7 @@ struct bsc_nat {
/* USSD messages we want to match */
char *ussd_lst_name;
char *ussd_query;
regex_t ussd_query_re;
char *ussd_token;
char *ussd_local;
struct bsc_fd ussd_listen;

8
openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
View File

@ -1,6 +1,6 @@
/* OpenBSC NAT interface to quagga VTY */
/* (C) 2010 by Holger Hans Peter Freyther
* (C) 2010 by On-Waves
/* (C) 2010-2011 by Holger Hans Peter Freyther
* (C) 2010-2011 by On-Waves
* All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
@ -463,11 +463,11 @@ DEFUN(cfg_nat_ussd_lst_name,
DEFUN(cfg_nat_ussd_query,
cfg_nat_ussd_query_cmd,
"ussd-query QUERY",
"ussd-query REGEXP",
"Set the USSD query to match with the ussd-list-name\n"
"The query to match")
{
bsc_replace_string(_nat, &_nat->ussd_query, argv[0]);
bsc_parse_reg(_nat, &_nat->ussd_query_re, &_nat->ussd_query, argc, argv);
return CMD_SUCCESS;
}

6
openbsc/src/osmo-bsc_nat/bsc_ussd.c
View File

@ -1,8 +1,8 @@
/* USSD Filter Code */
/*
* (C) 2010 by Holger Hans Peter Freyther <zecke@selfish.org>
* (C) 2010 by On-Waves
* (C) 2010-2011 by Holger Hans Peter Freyther <zecke@selfish.org>
* (C) 2010-2011 by On-Waves
* All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
@ -352,7 +352,7 @@ int bsc_check_ussd(struct sccp_connections *con, struct bsc_nat_parsed *parsed,
if (req.text[0] == 0xff)
return 0;
if (strcmp(req.text, con->bsc->nat->ussd_query) != 0)
if (regexec(&con->bsc->nat->ussd_query_re, req.text, 0, NULL, 0) == REG_NOMATCH)
return 0;
/* found a USSD query for our subscriber */