diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-02-24 00:28:13 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-02-24 00:43:41 +0100 |
| commit | fd1187e2e933122bdea20784a0b6b2a119351651 (patch) | |
| tree | 76baeb576517a3e6c4de2cf37a8ef789ca4c3611 | |
| parent | 1901b92f0c1f20dad30c883d91cc82556b4f2ebd (diff) | |
minor fixes in bsc_vty.c and bsc_nat.c
Remove unused talloc.h from bsc_vty.c.
In bsc_nat.c, use OSMO_CTRL_PORT_BSC_NAT instead of hardcoding port number, and
include ctrl/ports.h for that.
Fix comment typo "COMAMND"
| -rw-r--r-- | openbsc/src/libbsc/bsc_vty.c | 1 | ||||
| -rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_nat.c | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c index 4fbf33716..7fdee054c 100644 --- a/openbsc/src/libbsc/bsc_vty.c +++ b/openbsc/src/libbsc/bsc_vty.c @@ -43,7 +43,6 @@ #include <openbsc/chan_alloc.h> #include <openbsc/meas_rep.h> #include <openbsc/db.h> -#include <osmocom/core/talloc.h> #include <openbsc/vty.h> #include <osmocom/gprs/gprs_ns.h> #include <openbsc/system_information.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index 816ae58b6..41291d9b7 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -51,6 +51,7 @@ #include <osmocom/ctrl/control_cmd.h> #include <osmocom/ctrl/control_if.h> +#include <osmocom/ctrl/ports.h> #include <osmocom/crypt/auth.h> @@ -645,7 +646,7 @@ static void bsc_nat_handle_paging(struct bsc_nat *nat, struct msgb *msg) /* - * Update the auth status. This can be either a CIPHER MODE COMAMND or + * Update the auth status. This can be either a CIPHER MODE COMMAND or * a CM Serivce Accept. Maybe also LU Accept or such in the future. */ static void update_con_authorize(struct nat_sccp_connection *con, @@ -1655,7 +1656,7 @@ int main(int argc, char **argv) exit(1); } - nat->ctrl = bsc_nat_controlif_setup(nat, 4250); + nat->ctrl = bsc_nat_controlif_setup(nat, OSMO_CTRL_PORT_BSC_NAT); if (!nat->ctrl) { fprintf(stderr, "Creating the control interface failed.\n"); exit(1); |