the default port number was erroneously stored in host order,

and reading from the config file used ntohs instead of htons.

this ought to be merged to 1.4 as well.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45836 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/http.c b/main/http.c
index 5da224e..4a14cb1 100644 (file)
--- a/main/http.c
+++ b/main/http.c
@@ -628,7 +628,7 @@ static int __ast_http_load(int reload)
        char newprefix[MAX_PREFIX];
 
        memset(&sin, 0, sizeof(sin));
        char newprefix[MAX_PREFIX];
 
        memset(&sin, 0, sizeof(sin));

-       sin.sin_port = 8088;
+       sin.sin_port = htons(8088);

        strcpy(newprefix, DEFAULT_PREFIX);
        cfg = ast_config_load("http.conf");
        if (cfg) {
        strcpy(newprefix, DEFAULT_PREFIX);
        cfg = ast_config_load("http.conf");
        if (cfg) {

@@ -639,7 +639,7 @@ static int __ast_http_load(int reload)
                        else if (!strcasecmp(v->name, "enablestatic"))
                                newenablestatic = ast_true(v->value);
                        else if (!strcasecmp(v->name, "bindport"))
                        else if (!strcasecmp(v->name, "enablestatic"))
                                newenablestatic = ast_true(v->value);
                        else if (!strcasecmp(v->name, "bindport"))

-                               sin.sin_port = ntohs(atoi(v->value));
+                               sin.sin_port = htons(atoi(v->value));

                        else if (!strcasecmp(v->name, "bindaddr")) {
                                if ((hp = ast_gethostbyname(v->value, &ahp))) {
                                        memcpy(&sin.sin_addr, hp->h_addr, sizeof(sin.sin_addr));
                        else if (!strcasecmp(v->name, "bindaddr")) {
                                if ((hp = ast_gethostbyname(v->value, &ahp))) {
                                        memcpy(&sin.sin_addr, hp->h_addr, sizeof(sin.sin_addr));