From b4dbc10f0c1f498c965f4b01c66df89730582bf1 Mon Sep 17 00:00:00 2001 From: david Date: Fri, 19 Dec 2008 18:39:29 +0000 Subject: [PATCH] Rename the function send_closedudp_probe_2 to send_closedudp_probe (lose the _2 suffix). It was named this was to avoid a name conflict with first-gen OS detection, which isn't a problem now. --- osscan2.cc | 12 ++++++------ osscan2.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/osscan2.cc b/osscan2.cc index 3421a7b7a..3695a5ed4 100644 --- a/osscan2.cc +++ b/osscan2.cc @@ -1402,9 +1402,9 @@ void HostOsScan::sendTUdpProbe(HostOsScanStats *hss, int probeNo) { assert(hss); if(hss->closedUDPPort == -1) return; - send_closedudp_probe_2(hss->upi, rawsd, ethptr, hss->target->v4hostip(), - this->udpttl, udpPortBase + probeNo, - hss->closedUDPPort); + send_closedudp_probe(hss->upi, rawsd, ethptr, hss->target->v4hostip(), + this->udpttl, udpPortBase + probeNo, + hss->closedUDPPort); } bool HostOsScan::processResp(HostOsScanStats *hss, struct ip *ip, unsigned int len, struct timeval *rcvdtime) { @@ -3022,9 +3022,9 @@ int send_icmp_echo_probe(int sd, struct eth_nfo *eth, return 0; } -int send_closedudp_probe_2(struct udpprobeinfo &upi, int sd, - struct eth_nfo *eth, const struct in_addr *victim, - int ttl, u16 sport, u16 dport) { +int send_closedudp_probe(struct udpprobeinfo &upi, int sd, + struct eth_nfo *eth, const struct in_addr *victim, + int ttl, u16 sport, u16 dport) { static int myttl = 0; static u8 patternbyte = 0x43; /* character 'C' */ static u16 id = 0x1042; diff --git a/osscan2.h b/osscan2.h index 0fd531d75..aa41d9e05 100644 --- a/osscan2.h +++ b/osscan2.h @@ -118,9 +118,9 @@ class Target; processed as smaller groups to improve accuracy */ void os_scan2(std::vector &Targets); -int send_closedudp_probe_2(struct udpprobeinfo &upi, int sd, - struct eth_nfo *eth, const struct in_addr *victim, - int ttl, u16 sport, u16 dport); +int send_closedudp_probe(struct udpprobeinfo &upi, int sd, + struct eth_nfo *eth, const struct in_addr *victim, + int ttl, u16 sport, u16 dport); int send_icmp_echo_probe(int sd, struct eth_nfo *eth, const struct in_addr *victim, u8 tos, bool df, u8 pcode, unsigned short id, u16 seq, u16 datalen);