diff options
| -rw-r--r-- | dpid/dpid.c | 6 | ||||
| -rw-r--r-- | dpid/dpidc.c | 3 | ||||
| -rw-r--r-- | src/IO/dpi.c | 8 | ||||
| -rw-r--r-- | test/unit/cookies.c | 6 |
4 files changed, 13 insertions, 10 deletions
diff --git a/dpid/dpid.c b/dpid/dpid.c index 93df2e6a..9bf28f46 100644 --- a/dpid/dpid.c +++ b/dpid/dpid.c @@ -25,7 +25,9 @@ #include <sys/stat.h> #include <sys/wait.h> #include <sys/socket.h> +#include <netinet/in.h> #include <netinet/tcp.h> +#include <arpa/inet.h> #include <unistd.h> #include "dpid_common.h" @@ -564,7 +566,7 @@ int bind_socket_fd(int base_port, int *p_port) memset(&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; - sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + sin.sin_addr.s_addr = inet_addr("127.0.0.1"); /* Try to bind a port on localhost */ for (port = base_port; port <= last_port; ++port) { @@ -754,7 +756,7 @@ void stop_active_dpis(struct dp *dpi_attr_list, int numdpis) memset(&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; - sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + sin.sin_addr.s_addr = inet_addr("127.0.0.1"); for (i = 0; i < numdpis; i++) { /* Skip inactive dpis and filters */ diff --git a/dpid/dpidc.c b/dpid/dpidc.c index ca610127..f9e579b2 100644 --- a/dpid/dpidc.c +++ b/dpid/dpidc.c @@ -16,6 +16,7 @@ #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> +#include <arpa/inet.h> #include <netdb.h> #include <errno.h> @@ -91,7 +92,7 @@ int main(int argc, char *argv[]) error("ERROR opening socket"); memset(&serv_addr, 0, sizeof(serv_addr)); serv_addr.sin_family = AF_INET; - serv_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + serv_addr.sin_addr.s_addr = inet_addr("127.0.0.1"); serv_addr.sin_port = htons(portno); if (connect(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0) diff --git a/src/IO/dpi.c b/src/IO/dpi.c index 46ddc49e..2d265b78 100644 --- a/src/IO/dpi.c +++ b/src/IO/dpi.c @@ -26,6 +26,7 @@ #include <errno.h> /* for errno */ #include <fcntl.h> #include <ctype.h> /* isxdigit */ +#include <stdint.h> #include <sys/socket.h> #include <sys/un.h> @@ -51,7 +52,6 @@ #define AF_LOCAL AF_UNIX #endif - typedef struct { int InTag; int Send2EOF; @@ -445,7 +445,7 @@ static int Dpi_check_dpid_ids(void) /* socket connection test */ memset(&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; - sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + sin.sin_addr.s_addr = inet_addr("127.0.0.1"); if (Dpi_read_comm_keys(&dpid_port) != -1) { sin.sin_port = htons(dpid_port); @@ -544,7 +544,7 @@ static int Dpi_get_server_port(const char *server_name) sin_sz = sizeof(sin); memset(&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; - sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + sin.sin_addr.s_addr = inet_addr("127.0.0.1"); sin.sin_port = htons(dpid_port); if ((sock_fd = Dpi_make_socket_fd()) == -1 || connect(sock_fd, (struct sockaddr *)&sin, sin_sz) == -1) { @@ -617,7 +617,7 @@ static int Dpi_connect_socket(const char *server_name) /* connect with this server's socket */ memset(&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; - sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + sin.sin_addr.s_addr = inet_addr("127.0.0.1"); sin.sin_port = htons(dpi_port); if ((sock_fd = Dpi_make_socket_fd()) == -1) { diff --git a/test/unit/cookies.c b/test/unit/cookies.c index caef5d7b..40a19418 100644 --- a/test/unit/cookies.c +++ b/test/unit/cookies.c @@ -148,7 +148,7 @@ static int Dpi_check_dpid_ids() /* socket connection test */ memset(&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; - sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + sin.sin_addr.s_addr = inet_addr("127.0.0.1"); if (Dpi_read_comm_keys(&dpid_port) != -1) { sin.sin_port = htons(dpid_port); @@ -317,7 +317,7 @@ static int Dpi_get_server_port(const char *server_name) sin_sz = sizeof(sin); memset(&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; - sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + sin.sin_addr.s_addr = inet_addr("127.0.0.1"); sin.sin_port = htons(dpid_port); if ((sock_fd = Dpi_make_socket_fd()) == -1 || connect(sock_fd, (struct sockaddr *)&sin, sin_sz) == -1) { @@ -385,7 +385,7 @@ static int Dpi_connect_socket(const char *server_name) /* connect with this server's socket */ memset(&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; - sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + sin.sin_addr.s_addr = inet_addr("127.0.0.1"); sin.sin_port = htons(dpi_port); if ((sock_fd = Dpi_make_socket_fd()) == -1) { |