diff options
| author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-17 01:59:37 +0000 |
|---|---|---|
| committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-17 01:59:37 +0000 |
| commit | 7e6255c3e31e330ef4ba7d3c77e82adde1b9e6e0 (patch) | |
| tree | 60fd24b757557cf7093866ed2bd82ecdd1f7c34b /main/http.c | |
| parent | 4abe962cd4473b1f950e0d13cbd41ea9f533965d (diff) | |
Merged revisions 169080 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r169080 | twilson | 2009-01-16 19:56:36 -0600 (Fri, 16 Jan 2009) | 8 lines
Fix qualify for TCP peer
(closes issue #14192)
Reported by: pabelanger
Patches:
asterisk-bug14192.diff.txt uploaded by jamesgolovich (license 176)
Tested by: jamesgolovich
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169082 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/http.c')
| -rw-r--r-- | main/http.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/main/http.c b/main/http.c index aa6ee7f94..deb406165 100644 --- a/main/http.c +++ b/main/http.c @@ -257,13 +257,13 @@ static struct ast_str *httpstatus_callback(struct ast_tcptls_session_instance *s "<h2> Asterisk™ HTTP Status</h2></td></tr>\r\n"); ast_str_append(&out, 0, "<tr><td><i>Prefix</i></td><td><b>%s</b></td></tr>\r\n", prefix); ast_str_append(&out, 0, "<tr><td><i>Bind Address</i></td><td><b>%s</b></td></tr>\r\n", - ast_inet_ntoa(http_desc.old_local_address.sin_addr)); + ast_inet_ntoa(http_desc.old_address.sin_addr)); ast_str_append(&out, 0, "<tr><td><i>Bind Port</i></td><td><b>%d</b></td></tr>\r\n", - ntohs(http_desc.old_local_address.sin_port)); + ntohs(http_desc.old_address.sin_port)); if (http_tls_cfg.enabled) { ast_str_append(&out, 0, "<tr><td><i>SSL Bind Port</i></td><td><b>%d</b></td></tr>\r\n", - ntohs(https_desc.old_local_address.sin_port)); + ntohs(https_desc.old_address.sin_port)); } ast_str_append(&out, 0, "<tr><td colspan=\"2\"><hr></td></tr>\r\n"); @@ -973,16 +973,16 @@ static char *handle_show_http(struct ast_cli_entry *e, int cmd, struct ast_cli_a } ast_cli(a->fd, "HTTP Server Status:\n"); ast_cli(a->fd, "Prefix: %s\n", prefix); - if (!http_desc.old_local_address.sin_family) { + if (!http_desc.old_address.sin_family) { ast_cli(a->fd, "Server Disabled\n\n"); } else { ast_cli(a->fd, "Server Enabled and Bound to %s:%d\n\n", - ast_inet_ntoa(http_desc.old_local_address.sin_addr), - ntohs(http_desc.old_local_address.sin_port)); + ast_inet_ntoa(http_desc.old_address.sin_addr), + ntohs(http_desc.old_address.sin_port)); if (http_tls_cfg.enabled) { ast_cli(a->fd, "HTTPS Server Enabled and Bound to %s:%d\n\n", - ast_inet_ntoa(https_desc.old_local_address.sin_addr), - ntohs(https_desc.old_local_address.sin_port)); + ast_inet_ntoa(https_desc.old_address.sin_addr), + ntohs(https_desc.old_address.sin_port)); } } |