| From 2a361989b5f84ec23ba7ccb6e527a5590ff55deb Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Sun, 20 Jan 2019 23:11:56 -0800 |
| Subject: [PATCH] Fix building with libc++ |
| |
| Upstream-Status: Pending |
| |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| --- |
| nping/EchoServer.cc | 16 ++++++++-------- |
| 1 file changed, 8 insertions(+), 8 deletions(-) |
| |
| diff --git a/nping/EchoServer.cc b/nping/EchoServer.cc |
| index 40cd4d6..04433e1 100644 |
| --- a/nping/EchoServer.cc |
| +++ b/nping/EchoServer.cc |
| @@ -282,14 +282,14 @@ int EchoServer::nep_listen_socket(){ |
| server_addr6.sin6_len = sizeof(struct sockaddr_in6); |
| #endif |
| /* Bind to local address and the specified port */ |
| - if( bind(master_sd, (struct sockaddr *)&server_addr6, sizeof(server_addr6)) != 0 ){ |
| + if( ::bind(master_sd, (struct sockaddr *)&server_addr6, sizeof(server_addr6)) != 0 ){ |
| nping_warning(QT_3, "Failed to bind to source address %s. Trying to bind to port %d...", IPtoa(server_addr6.sin6_addr), port); |
| /* If the bind failed for the supplied address, just try again with in6addr_any */ |
| if( o.spoofSource() ){ |
| server_addr6.sin6_addr = in6addr_any; |
| - if( bind(master_sd, (struct sockaddr *)&server_addr6, sizeof(server_addr6)) != 0 ){ |
| + if( ::bind(master_sd, (struct sockaddr *)&server_addr6, sizeof(server_addr6)) != 0 ){ |
| nping_fatal(QT_3, "Could not bind to port %d (%s).", port, strerror(errno)); |
| - }else{ |
| + }else{ |
| nping_print(VB_1, "Server bound to port %d", port); |
| } |
| } |
| @@ -320,12 +320,12 @@ int EchoServer::nep_listen_socket(){ |
| #endif |
| |
| /* Bind to local address and the specified port */ |
| - if( bind(master_sd, (struct sockaddr *)&server_addr4, sizeof(server_addr4)) != 0 ){ |
| + if( ::bind(master_sd, (struct sockaddr *)&server_addr4, sizeof(server_addr4)) != 0 ){ |
| nping_warning(QT_3, "Failed to bind to source address %s. Trying to bind to port %d...", IPtoa(server_addr4.sin_addr), port); |
| /* If the bind failed for the supplied address, just try again with in6addr_any */ |
| if( o.spoofSource() ){ |
| server_addr4.sin_addr.s_addr=INADDR_ANY; |
| - if( bind(master_sd, (struct sockaddr *)&server_addr4, sizeof(server_addr4)) != 0 ){ |
| + if( ::bind(master_sd, (struct sockaddr *)&server_addr4, sizeof(server_addr4)) != 0 ){ |
| nping_fatal(QT_3, "Could not bind to port %d (%s).", port, strerror(errno)); |
| }else{ |
| nping_print(VB_1, "Server bound to port %d", port); |
| @@ -561,7 +561,7 @@ clientid_t EchoServer::nep_match_headers(IPv4Header *ip4, IPv6Header *ip6, TCPHe |
| nping_print(DBG_3, ";"); |
| /* The payload magic may affect the score only between |
| * zero and 4 bytes. This is done to prevent long |
| - * common strings like "GET / HTTP/1.1\r\n" |
| + * common strings like "GET / HTTP/1.1\r\n" |
| * increasing the score a lot and cause problems for |
| * the matching logic. */ |
| current_score+= MIN(4, fspec->len)*FACTOR_PAYLOAD_MAGIC; |
| @@ -571,7 +571,7 @@ clientid_t EchoServer::nep_match_headers(IPv4Header *ip4, IPv6Header *ip6, TCPHe |
| default: |
| nping_warning(QT_2, "Bogus field specifier found in client #%d context. Please report a bug", ctx->getIdentifier()); |
| break; |
| - } |
| + } |
| } /* End of field specifiers loop */ |
| |
| nping_print(DBG_3, "%s() current_score=%.02f candidate_score=%.02f", __func__, current_score, candidate_score); |
| @@ -650,7 +650,7 @@ clientid_t EchoServer::nep_match_packet(const u8 *pkt, size_t pktlen){ |
| }else{ |
| if( (tcplen=tcp.validate())==OP_FAILURE){ |
| return CLIENT_NOT_FOUND; |
| - }else{ |
| + }else{ |
| if( (int)pktlen > (iplen+tcplen) ){ |
| if( payload.storeRecvData(pkt+iplen+tcplen, pktlen-iplen-tcplen)!=OP_FAILURE) |
| payload_included=true; |