mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-08-15 22:10:06 +00:00
5db1cb3137
The nmap has changed its license to NPSL (Nmap Public Source License) since 7.90[1][2]. See [3] for a discussion of this license. According to [1] and [4], 7.92 is the last dual-licensed (GPL-2.0 and NPSL)version: "Note that some releases of Nmap may fall under a previous version of this license, or a different license entirely. The exact terms for a given version of Nmap can be found in the included LICENSE or COPYING file. To ease the transition to the NPSL, the first three Nmap releases made under that license (Nmap 7.90, 7.91, and 7.92) may also be used under the previous Nmap license terms by anyone who prefers those. " Add 7.92 recipe with GPLv2 license. [1] https://nmap.org/npsl/ [2] https://lwn.net/Articles/842436/ [3] https://github.com/nmap/nmap/issues/2199 [4] https://nmap.org/changelog.html#7.92 Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
80 lines
4.3 KiB
Diff
80 lines
4.3 KiB
Diff
From 4c54b00e6f3749924532c2636eae01daff9e4bcd 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 c80efb4..914bd54 100644
|
|
--- a/nping/EchoServer.cc
|
|
+++ b/nping/EchoServer.cc
|
|
@@ -214,14 +214,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);
|
|
}
|
|
}
|
|
@@ -252,12 +252,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);
|
|
@@ -493,7 +493,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;
|
|
@@ -503,7 +503,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);
|
|
@@ -582,7 +582,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;
|
|
--
|
|
2.34.1
|
|
|