diff options
| author |   Pau Espin Pedrol <pespin@sysmocom.de> | 2018-02-19 16:24:45 +0100 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-02-19 17:29:28 +0100 |
| commit | e39e18992a3b966581f06fa632d6342643996aaa (patch) | |
| tree | 7b3c3f9f9214c8ea775183f4a6b8ed5aede4ab6b | |
| parent | src/libmsc/ussd.c: drop useless forward declaration (diff) | |
| download | OpenBSC-e39e18992a3b966581f06fa632d6342643996aaa.tar.xz OpenBSC-e39e18992a3b966581f06fa632d6342643996aaa.zip | |
mgcp_protocol: Don't print osmux stats if it is off
Otherwise we get Osmux stats during a session using RTP, which is
confusing.
Change-Id: I814b2051edc85ad5cbd04c96b785c208f6606683
| -rw-r--r-- | openbsc/src/libmgcp/mgcp_protocol.c | 38 | ||||
| -rw-r--r-- | openbsc/tests/mgcp/mgcp_test.c | 4 |
2 files changed, 23 insertions, 19 deletions
diff --git a/openbsc/src/libmgcp/mgcp_protocol.c b/openbsc/src/libmgcp/mgcp_protocol.c index 7cc62560d..ae5c90bcc 100644 --- a/openbsc/src/libmgcp/mgcp_protocol.c +++ b/openbsc/src/libmgcp/mgcp_protocol.c @@ -1548,24 +1548,26 @@ void mgcp_format_stats(struct mgcp_endpoint *endp, char *msg, size_t size) msg += nchars; size -= nchars; - /* Error Counter */ - nchars = snprintf(msg, size, - "\r\nX-Osmo-CP: EC TIS=%u, TOS=%u, TIR=%u, TOR=%u", - endp->net_state.in_stream.err_ts_counter, - endp->net_state.out_stream.err_ts_counter, - endp->bts_state.in_stream.err_ts_counter, - endp->bts_state.out_stream.err_ts_counter); - if (nchars < 0 || nchars >= size) - goto truncate; - - msg += nchars; - size -= nchars; - - if (endp->osmux.state == OSMUX_STATE_ENABLED) { - snprintf(msg, size, - "\r\nX-Osmux-ST: CR=%u, BR=%u", - endp->osmux.stats.chunks, - endp->osmux.stats.octets); + if (endp->cfg->osmux != OSMUX_USAGE_OFF) { + /* Error Counter */ + nchars = snprintf(msg, size, + "\r\nX-Osmo-CP: EC TIS=%u, TOS=%u, TIR=%u, TOR=%u", + endp->net_state.in_stream.err_ts_counter, + endp->net_state.out_stream.err_ts_counter, + endp->bts_state.in_stream.err_ts_counter, + endp->bts_state.out_stream.err_ts_counter); + if (nchars < 0 || nchars >= size) + goto truncate; + + msg += nchars; + size -= nchars; + + if (endp->osmux.state == OSMUX_STATE_ENABLED) { + snprintf(msg, size, + "\r\nX-Osmux-ST: CR=%u, BR=%u", + endp->osmux.stats.chunks, + endp->osmux.stats.octets); + } } truncate: msg[size - 1] = '\0'; diff --git a/openbsc/tests/mgcp/mgcp_test.c b/openbsc/tests/mgcp/mgcp_test.c index 43a453af8..570a0c927 100644 --- a/openbsc/tests/mgcp/mgcp_test.c +++ b/openbsc/tests/mgcp/mgcp_test.c @@ -268,7 +268,9 @@ static void test_strline(void) "C: 2\r\n" #define DLCX_RET "250 7 OK\r\n" \ - "P: PS=0, OS=0, PR=0, OR=0, PL=0, JI=0\r\n" \ + "P: PS=0, OS=0, PR=0, OR=0, PL=0, JI=0\r\n" + + #define DLCX_RET_OSMUX DLCX_RET \ "X-Osmo-CP: EC TIS=0, TOS=0, TIR=0, TOR=0\r\n" #define RQNT "RQNT 186908780 1@mgw MGCP 1.0\r\n" \ |