kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-14 22:08:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made ast_sockaddr_split_hostport() port warning msgs more meaningful.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@323394 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2011-06-14 17:21:39 +00:00
parent 2b2aa6ba3e
commit 0fe02d0183
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
main/netsock2.c
View File

@@ -121,8 +121,10 @@ char *ast_sockaddr_stringify_fmt(const struct ast_sockaddr *sa, int format)
int ast_sockaddr_split_hostport(char *str, char **host, char **port, int flags) int ast_sockaddr_split_hostport(char *str, char **host, char **port, int flags)
{ {
char *s = str; char *s = str;
char *orig_str = str;/* Original string in case the port presence is incorrect. */
char *host_end = NULL;/* Delay terminating the host in case the port presence is incorrect. */
ast_debug(5, "Splitting '%s' gives...\n", str); ast_debug(5, "Splitting '%s' into...\n", str);
*host = NULL; *host = NULL;
*port = NULL; *port = NULL;
if (*s == '[') { if (*s == '[') {
@@ -130,7 +132,8 @@ int ast_sockaddr_split_hostport(char *str, char **host, char **port, int flags)
for (; *s && *s != ']'; ++s) { for (; *s && *s != ']'; ++s) {
} }
if (*s == ']') { if (*s == ']') {
*s++ = '\0'; host_end = s;
++s;
} }
if (*s == ':') { if (*s == ':') {
*port = s + 1; *port = s + 1;
@@ -148,11 +151,10 @@ int ast_sockaddr_split_hostport(char *str, char **host, char **port, int flags)
} }
} }
if (*port) { if (*port) {
**port = '\0'; host_end = *port;
++*port; ++*port;
} }
} }
ast_debug(5, "...host '%s' and port '%s'.\n", *host, *port);
switch (flags & PARSE_PORT_MASK) { switch (flags & PARSE_PORT_MASK) {
case PARSE_PORT_IGNORE: case PARSE_PORT_IGNORE:
@@ -160,18 +162,23 @@ int ast_sockaddr_split_hostport(char *str, char **host, char **port, int flags)
break; break;
case PARSE_PORT_REQUIRE: case PARSE_PORT_REQUIRE:
if (*port == NULL) { if (*port == NULL) {
ast_log(LOG_WARNING, "missing port\n"); ast_log(LOG_WARNING, "Port missing in %s\n", orig_str);
return 0; return 0;
} }
break; break;
case PARSE_PORT_FORBID: case PARSE_PORT_FORBID:
if (*port != NULL) { if (*port != NULL) {
ast_log(LOG_WARNING, "port disallowed\n"); ast_log(LOG_WARNING, "Port disallowed in %s\n", orig_str);
return 0; return 0;
} }
break; break;
} }
/* Can terminate the host string now if needed. */
if (host_end) {
*host_end = '\0';
}
ast_debug(5, "...host '%s' and port '%s'.\n", *host, *port ? *port : "");
return 1; return 1;
} }