kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-05 18:13:27 +00:00
Code Issues Projects Releases Wiki Activity

ftmod_libpri: Improve output of ftdm libpri api 'invalid span' error messages.

Browse Source 
No more "invalid span", now it's either "'foo' not a libpri span" or
"'foo' span not found" which makes it a lot more useful.

Signed-off-by: Stefan Knoblich <stkn@openisdn.net>
This commit is contained in:
Stefan Knoblich 2011-11-18 23:02:07 +01:00
parent 5897ec5992
commit 2de175b574
1 changed files with 23 additions and 10 deletions

33
libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c

@ -319,7 +319,8 @@ static FIO_API_FUNCTION(ftdm_libpri_api)
ftdm_libpri_data_t *isdn_data = span->signal_data; ftdm_libpri_data_t *isdn_data = span->signal_data;
if (span->start != ftdm_libpri_start) { if (span->start != ftdm_libpri_start) {
stream->write_function(stream, "%s: -ERR invalid span.\n", __FILE__); stream->write_function(stream, "%s: -ERR '%s' is not a libpri span.\n",
__FILE__, ftdm_span_get_name(span));
goto done; goto done;
} }
@ -327,7 +328,8 @@ static FIO_API_FUNCTION(ftdm_libpri_api)
stream->write_function(stream, "%s: +OK killed.\n", __FILE__); stream->write_function(stream, "%s: +OK killed.\n", __FILE__);
goto done; goto done;
} else { } else {
stream->write_function(stream, "%s: -ERR invalid span.\n", __FILE__); stream->write_function(stream, "%s: -ERR span '%s' not found.\n",
__FILE__, argv[0]);
goto done; goto done;
} }
} }
@ -340,7 +342,8 @@ static FIO_API_FUNCTION(ftdm_libpri_api)
uint32_t flags = 0; uint32_t flags = 0;
if (span->start != ftdm_libpri_start) { if (span->start != ftdm_libpri_start) {
stream->write_function(stream, "%s: -ERR invalid span.\n", __FILE__); stream->write_function(stream, "%s: -ERR '%s' is not a libpri span.\n",
__FILE__, ftdm_span_get_name(span));
goto done; goto done;
} }
@ -360,7 +363,8 @@ static FIO_API_FUNCTION(ftdm_libpri_api)
stream->write_function(stream, "%s: +OK debug %s.\n", __FILE__, (flags) ? "enabled" : "disabled"); stream->write_function(stream, "%s: +OK debug %s.\n", __FILE__, (flags) ? "enabled" : "disabled");
goto done; goto done;
} else { } else {
stream->write_function(stream, "%s: -ERR invalid span.\n", __FILE__); stream->write_function(stream, "%s: -ERR span '%s' not found.\n",
__FILE__, argv[0]);
goto done; goto done;
} }
} }
@ -368,8 +372,10 @@ static FIO_API_FUNCTION(ftdm_libpri_api)
ftdm_span_t *span = NULL; ftdm_span_t *span = NULL;
if (ftdm_span_find_by_name(argv[1], &span) == FTDM_SUCCESS) { if (ftdm_span_find_by_name(argv[1], &span) == FTDM_SUCCESS) {
ftdm_libpri_data_t *isdn_data = span->signal_data; ftdm_libpri_data_t *isdn_data = span->signal_data;
if (span->start != ftdm_libpri_start) { if (span->start != ftdm_libpri_start) {
stream->write_function(stream, "%s: -ERR invalid span.\n", __FILE__); stream->write_function(stream, "%s: -ERR '%s' is not a libpri span.\n",
__FILE__, ftdm_span_get_name(span));
goto done; goto done;
} }
@ -377,7 +383,8 @@ static FIO_API_FUNCTION(ftdm_libpri_api)
stream->write_function(stream, "%s: +OK reset.\n", __FILE__); stream->write_function(stream, "%s: +OK reset.\n", __FILE__);
goto done; goto done;
} else { } else {
stream->write_function(stream, "%s: -ERR invalid span.\n", __FILE__); stream->write_function(stream, "%s: -ERR span '%s' not found.\n",
__FILE__, argv[0]);
goto done; goto done;
} }
} }
@ -385,8 +392,10 @@ static FIO_API_FUNCTION(ftdm_libpri_api)
ftdm_span_t *span = NULL; ftdm_span_t *span = NULL;
if (ftdm_span_find_by_name(argv[1], &span) == FTDM_SUCCESS) { if (ftdm_span_find_by_name(argv[1], &span) == FTDM_SUCCESS) {
ftdm_libpri_data_t *isdn_data = span->signal_data; ftdm_libpri_data_t *isdn_data = span->signal_data;
if (span->start != ftdm_libpri_start) { if (span->start != ftdm_libpri_start) {
stream->write_function(stream, "%s: -ERR invalid span.\n", __FILE__); stream->write_function(stream, "%s: -ERR '%s' is not a libpri span.\n",
__FILE__, ftdm_span_get_name(span));
goto done; goto done;
} }
if (!strcasecmp(argv[2], "all")) { if (!strcasecmp(argv[2], "all")) {
@ -401,7 +410,8 @@ static FIO_API_FUNCTION(ftdm_libpri_api)
stream->write_function(stream, "%s: +OK restart set.\n", __FILE__); stream->write_function(stream, "%s: +OK restart set.\n", __FILE__);
goto done; goto done;
} else { } else {
stream->write_function(stream, "%s: -ERR invalid span.\n", __FILE__); stream->write_function(stream, "%s: -ERR span '%s' not found.\n",
__FILE__, argv[0]);
goto done; goto done;
} }
} }
@ -409,8 +419,10 @@ static FIO_API_FUNCTION(ftdm_libpri_api)
ftdm_span_t *span = NULL; ftdm_span_t *span = NULL;
if (ftdm_span_find_by_name(argv[1], &span) == FTDM_SUCCESS) { if (ftdm_span_find_by_name(argv[1], &span) == FTDM_SUCCESS) {
ftdm_libpri_data_t *isdn_data = span->signal_data; ftdm_libpri_data_t *isdn_data = span->signal_data;
if (span->start != ftdm_libpri_start) { if (span->start != ftdm_libpri_start) {
stream->write_function(stream, "%s: -ERR invalid span.\n", __FILE__); stream->write_function(stream, "%s: -ERR '%s' is not a libpri span.\n",
__FILE__, ftdm_span_get_name(span));
goto done; goto done;
} }
if (!isdn_data->service_message_support) { if (!isdn_data->service_message_support) {
@ -429,7 +441,8 @@ static FIO_API_FUNCTION(ftdm_libpri_api)
stream->write_function(stream, "%s: +OK change status set.\n", __FILE__); stream->write_function(stream, "%s: +OK change status set.\n", __FILE__);
goto done; goto done;
} else { } else {
stream->write_function(stream, "%s: -ERR invalid span.\n", __FILE__); stream->write_function(stream, "%s: -ERR span '%s' not found.\n",
__FILE__, argv[0]);
goto done; goto done;
} }
} }