[PATCH 0/4] some minor updates and fixes for openbsc (master) v2
These patches for openbsc * fix some implicit declarations of functions * fix a non-critical mismatch in fprintf format specifiers If the patches seem useful, please merge them to master.
--- openbsc/include/openbsc/control_if.h | 13 +++++++++++++ openbsc/include/openbsc/handover_decision.h | 7 +++++++ openbsc/include/openbsc/rrlp.h | 7 +++++++ openbsc/include/openbsc/token_auth.h | 7 +++++++ openbsc/src/osmo-nitb/bsc_hack.c | 4 ++++ 5 files changed, 38 insertions(+), 0 deletions(-) create mode 100644 openbsc/include/openbsc/control_if.h create mode 100644 openbsc/include/openbsc/handover_decision.h create mode 100644 openbsc/include/openbsc/rrlp.h create mode 100644 openbsc/include/openbsc/token_auth.h diff --git a/openbsc/include/openbsc/control_if.h b/openbsc/include/openbsc/control_if.h new file mode 100644 index 0000000..96fbf6b --- /dev/null +++ b/openbsc/include/openbsc/control_if.h @@ -0,0 +1,13 @@ +#ifndef _CONTROL_IF_H +#define _CONTROL_IF_H + +#include <osmocom/core/write_queue.h> +#include <openbsc/control_cmd.h> +#include <openbsc/gsm_data.h> + +int ctrl_cmd_send(struct osmo_wqueue *queue, struct ctrl_cmd *cmd); +int ctrl_cmd_handle(struct ctrl_cmd *cmd, void *data); +int controlif_setup(struct gsm_network *gsmnet, uint16_t port); + +#endif /* _CONTROL_IF_H */ + diff --git a/openbsc/include/openbsc/handover_decision.h b/openbsc/include/openbsc/handover_decision.h new file mode 100644 index 0000000..81078b0 --- /dev/null +++ b/openbsc/include/openbsc/handover_decision.h @@ -0,0 +1,7 @@ +#ifndef _HANDOVER_DECISION_H +#define _HANDOVER_DECISION_H + +void on_dso_load_ho_dec(void); + +#endif /* _HANDOVER_DECISION_H */ + diff --git a/openbsc/include/openbsc/rrlp.h b/openbsc/include/openbsc/rrlp.h new file mode 100644 index 0000000..c89402a --- /dev/null +++ b/openbsc/include/openbsc/rrlp.h @@ -0,0 +1,7 @@ +#ifndef _RRLP_H +#define _RRLP_H + +void on_dso_load_rrlp(void); + +#endif /* _RRLP_H */ + diff --git a/openbsc/include/openbsc/token_auth.h b/openbsc/include/openbsc/token_auth.h new file mode 100644 index 0000000..47dc7aa --- /dev/null +++ b/openbsc/include/openbsc/token_auth.h @@ -0,0 +1,7 @@ +#ifndef _TOKEN_AUTH_H +#define _TOKEN_AUTH_H + +void on_dso_load_token(void); + +#endif /* _TOKEN_AUTH_H */ + diff --git a/openbsc/src/osmo-nitb/bsc_hack.c b/openbsc/src/osmo-nitb/bsc_hack.c index b41b808..001d8f9 100644 --- a/openbsc/src/osmo-nitb/bsc_hack.c +++ b/openbsc/src/osmo-nitb/bsc_hack.c @@ -42,6 +42,10 @@ #include <openbsc/vty.h> #include <openbsc/bss.h> #include <openbsc/mncc.h> +#include <openbsc/token_auth.h> +#include <openbsc/handover_decision.h> +#include <openbsc/rrlp.h> +#include <openbsc/control_if.h> #include "../../bscconfig.h" -- 1.7.6.1
--- openbsc/include/openbsc/trau_upqueue.h | 7 +++++++ openbsc/src/libtrau/rtp_proxy.c | 1 + openbsc/src/libtrau/trau_mux.c | 1 + 3 files changed, 9 insertions(+), 0 deletions(-) create mode 100644 openbsc/include/openbsc/trau_upqueue.h diff --git a/openbsc/include/openbsc/trau_upqueue.h b/openbsc/include/openbsc/trau_upqueue.h new file mode 100644 index 0000000..ecc7658 --- /dev/null +++ b/openbsc/include/openbsc/trau_upqueue.h @@ -0,0 +1,7 @@ +#ifndef _TRAU_UPQUEUE_H +#define _TRAU_UPQUEUE_H + +void trau_tx_to_mncc(struct gsm_network *net, struct msgb *msg); + +#endif /* _TRAU_UPQUEUE_H */ + diff --git a/openbsc/src/libtrau/rtp_proxy.c b/openbsc/src/libtrau/rtp_proxy.c index 2aa3a1e..3d34ac6 100644 --- a/openbsc/src/libtrau/rtp_proxy.c +++ b/openbsc/src/libtrau/rtp_proxy.c @@ -35,6 +35,7 @@ #include <openbsc/debug.h> #include <openbsc/rtp_proxy.h> #include <openbsc/mncc.h> +#include <openbsc/trau_upqueue.h> /* attempt to determine byte order */ #include <sys/param.h> diff --git a/openbsc/src/libtrau/trau_mux.c b/openbsc/src/libtrau/trau_mux.c index 6a6b7c5..3260ff5 100644 --- a/openbsc/src/libtrau/trau_mux.c +++ b/openbsc/src/libtrau/trau_mux.c @@ -29,6 +29,7 @@ #include <osmocom/abis/e1_input.h> #include <openbsc/debug.h> #include <osmocom/core/talloc.h> +#include <openbsc/trau_upqueue.h> /* this corresponds to teh bit-lengths of the individual codec * parameters as indicated in Table 1.1 of TS 06.10 */ -- 1.7.6.1
--- openbsc/include/openbsc/e1_config.h | 11 +++++++++++ openbsc/src/libbsc/bsc_init.c | 2 ++ 2 files changed, 13 insertions(+), 0 deletions(-) create mode 100644 openbsc/include/openbsc/e1_config.h diff --git a/openbsc/include/openbsc/e1_config.h b/openbsc/include/openbsc/e1_config.h new file mode 100644 index 0000000..538c0b0 --- /dev/null +++ b/openbsc/include/openbsc/e1_config.h @@ -0,0 +1,11 @@ +#ifndef _E1_CONFIG_H +#define _E1_CONFIG_H + +#include <openbsc/gsm_data_shared.h> + +int e1_reconfig_ts(struct gsm_bts_trx_ts *ts); +int e1_reconfig_trx(struct gsm_bts_trx *trx); +int e1_reconfig_bts(struct gsm_bts *bts); + +#endif /* _E1_CONFIG_H */ + diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c index 84dfa6e..28f32cc 100644 --- a/openbsc/src/libbsc/bsc_init.c +++ b/openbsc/src/libbsc/bsc_init.c @@ -33,6 +33,8 @@ #include <openbsc/chan_alloc.h> #include <osmocom/core/talloc.h> #include <openbsc/ipaccess.h> +#include <osmocom/gsm/sysinfo.h> +#include <openbsc/e1_config.h> /* global pointer to the gsm network data structure */ extern struct gsm_network *bsc_gsmnet; -- 1.7.6.1
--- openbsc/src/osmo-bsc_mgcp/mgcp_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c index ee1543c..b334b06 100644 --- a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c +++ b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c @@ -156,8 +156,8 @@ static int read_call_agent(struct osmo_fd *fd, unsigned int what) perror("Gateway failed to read"); return -1; } else if (slen > sizeof(addr)) { - fprintf(stderr, "Gateway received message from outerspace: %lu %d\n", - slen, sizeof(addr)); + fprintf(stderr, "Gateway received message from outerspace: %lu %lu\n", + (unsigned long int)slen, sizeof(addr)); return -1; } -- 1.7.6.1
On Tue, Sep 06, 2011 at 12:09:47AM +0200, Alexander Huemer wrote:
These patches for openbsc * fix some implicit declarations of functions * fix a non-critical mismatch in fprintf format specifiers
thanks, applying them right now. -- - Harald Welte <laforge@gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)
participants (2)
-
Alexander Huemer -
Harald Welte