diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2012-01-21 10:51:50 +0000 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2012-01-22 11:41:54 +0100 |
| commit | 77ffc9374287c1b06388d6d07a26f79022babd73 (patch) | |
| tree | 1a5c2ef1654ed8f831c3b176a833fad7bbce15ea /src | |
| parent | 8aaaa406bbee61920226a4c13f2a9e83daca10f3 (diff) | |
mgcp: Rename from snmp to hw in variables and function name.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mgcp_hw.c | 9 | ||||
| -rw-r--r-- | src/mgcp_ss7.c | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/mgcp_hw.c b/src/mgcp_hw.c index 34ca9ee..0356440 100644 --- a/src/mgcp_hw.c +++ b/src/mgcp_hw.c @@ -1,6 +1,6 @@ /* - * (C) 2010-2011 by Holger Hans Peter Freyther <zecke@selfish.org> - * (C) 2010-2011 by On-Waves + * (C) 2010-2012 by Holger Hans Peter Freyther <zecke@selfish.org> + * (C) 2010-2012 by On-Waves * All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -23,6 +23,7 @@ #include <net-snmp/net-snmp-includes.h> #include <cellmgr_debug.h> +#include <mgcp_ss7.h> #define HSCOMM "PTI-NexusWare-HSCMCONN-MIB::" @@ -72,7 +73,7 @@ static int tx_port_get(int port) return PTMC_STREAM_A_TX0 + port; } -int mgcp_snmp_init() +int mgcp_hw_init() { init_snmp("mgcp_mgw"); snmp_sess_init(&g_session); @@ -92,7 +93,7 @@ int mgcp_snmp_init() return 0; } -int mgcp_snmp_connect(int port, int trunk, int timeslot) +int mgcp_hw_connect(int port, int trunk, int timeslot) { int status; netsnmp_pdu *response = NULL; diff --git a/src/mgcp_ss7.c b/src/mgcp_ss7.c index 9a1b0b6..ae43e5e 100644 --- a/src/mgcp_ss7.c +++ b/src/mgcp_ss7.c @@ -80,7 +80,7 @@ static int select_voice_port(struct mgcp_endpoint *endp) return -1; } - mgw_port = endp->hw_snmp_port - 1; + mgw_port = endp->hw_dsp_port - 1; fprintf(stderr, "TEST: Going to use MGW: %d for MUL: %d TS: %d\n", mgw_port, multiplex, timeslot); return mgw_port; @@ -675,13 +675,13 @@ static int configure_trunk(struct mgcp_trunk_config *tcfg, int *dsp_resource) continue; *dsp_resource += 1; - tcfg->endpoints[i].hw_snmp_port = *dsp_resource; + tcfg->endpoints[i].hw_dsp_port = *dsp_resource; if (tcfg->cfg->configure_trunks) { int multiplex, timeslot, res; mgcp_endpoint_to_timeslot(i, &multiplex, ×lot); - res = mgcp_snmp_connect(*dsp_resource, + res = mgcp_hw_connect(*dsp_resource, start + multiplex, timeslot); @@ -724,7 +724,7 @@ static struct mgcp_ss7 *mgcp_ss7_init(struct mgcp_config *cfg) return NULL; } - if (cfg->configure_trunks && mgcp_snmp_init() != 0) { + if (cfg->configure_trunks && mgcp_hw_init() != 0) { LOGP(DMGCP, LOGL_ERROR, "Failed to initialize SNMP.\n"); talloc_free(conf); return NULL; |