diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-04-06 21:49:41 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-04-06 21:51:26 +0200 |
| commit | 9960d59fffa176ab022c9641c7358030d7f8065c (patch) | |
| tree | 18573b4edf3eb496307d4b33d99ca031c98c3981 /openbsc/src/mgcp/mgcp_main.c | |
| parent | 161bd6d253abeef6b181dbe9fdd245bd7c9884af (diff) | |
| parent | 3c71232b112a40bf09bd9687f1bc6aed12e863a3 (diff) | |
Merge remote branch 'origin/master' into on-waves/bsc-master
* Move to the new log code and update binaries
* Catch up with lchan changes from master
Conflicts:
openbsc/include/openbsc/Makefile.am
openbsc/include/openbsc/gsm_data.h
openbsc/src/Makefile.am
openbsc/src/bsc_rll.c
openbsc/src/chan_alloc.c
openbsc/src/debug.c
openbsc/src/gsm_04_08.c
openbsc/src/gsm_04_11.c
openbsc/src/gsm_subscriber_base.c
openbsc/src/handover_logic.c
openbsc/src/silent_call.c
openbsc/src/transaction.c
openbsc/src/vty_interface.c
openbsc/src/vty_interface_cmds.c
Diffstat (limited to 'openbsc/src/mgcp/mgcp_main.c')
| -rw-r--r-- | openbsc/src/mgcp/mgcp_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/openbsc/src/mgcp/mgcp_main.c b/openbsc/src/mgcp/mgcp_main.c index 802e16e21..80b7b543c 100644 --- a/openbsc/src/mgcp/mgcp_main.c +++ b/openbsc/src/mgcp/mgcp_main.c @@ -59,7 +59,7 @@ static struct mgcp_config *cfg; static int reset_endpoints = 0; const char *openbsc_version = "OpenBSC MGCP " PACKAGE_VERSION; -const char *openbsc_copyright = +const char *openbsc_copyright = "Copyright (C) 2009-2010 Holger Freyther and On-Waves\n" "Contributions by Daniel Willmann, Jan Lübbe,Stefan Schmidt\n" "Dieter Spaar, Andreas Eversberg, Harald Welte\n\n" @@ -178,14 +178,14 @@ int main(int argc, char** argv) struct gsm_network dummy_network; struct sockaddr_in addr; int on = 1, rc; - struct debug_target *stderr_target; + struct log_target *stderr_target; tall_bsc_ctx = talloc_named_const(NULL, 1, "mgcp-callagent"); - debug_init(); - stderr_target = debug_target_create_stderr(); - debug_add_target(stderr_target); - debug_set_all_filter(stderr_target, 1); + log_init(&log_info); + stderr_target = log_target_create_stderr(); + log_add_target(stderr_target); + log_set_all_filter(stderr_target, 1); cfg = mgcp_config_alloc(); if (!cfg) |