From 34c9ba98929642b76ba2e7b02c6cc07134b789c3 Mon Sep 17 00:00:00 2001 From: sean Date: Tue, 12 Jun 2012 03:52:46 +0000 Subject: [PATCH] =?UTF-8?q?Fixed=20the=20utils=5Fnet.cc:=20In=20function?= =?UTF-8?q?=20=E2=80=98int=20send=5Fpacket(NpingTarget*,=20int,=20u8*,=20s?= =?UTF-8?q?ize=5Ft)=E2=80=99:=20utils=5Fnet.cc:1114:7:=20warning:=20variab?= =?UTF-8?q?le=20=E2=80=98res=E2=80=99=20set=20but=20not=20used=20[-Wunused?= =?UTF-8?q?-but-set-variable]=20warnings=20by=20catching=20the=20return=20?= =?UTF-8?q?values=20of=20res=20and=20if=20they=20indicate=20failure=20at?= =?UTF-8?q?=20a=20lower=20level=20return=20OP=5FFAILURE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nping/utils_net.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nping/utils_net.cc b/nping/utils_net.cc index edf903c82..a86e85f39 100644 --- a/nping/utils_net.cc +++ b/nping/utils_net.cc @@ -1151,6 +1151,8 @@ int send_packet(NpingTarget *target, int rawfd, u8 *pkt, size_t pktLen){ s6.sin6_port=0; res = Sendto("send_packet", rawfd, pkt, pktLen, 0, (struct sockaddr *)&s6, (int) sizeof(struct sockaddr_in6)); + /*Sendto returns errors as -1 according to netutil.cc so lets catch that and return OP_FAILURE*/ + if (res == -1) return OP_FAILURE; }else{ /* IPv4 */ struct sockaddr_storage dst; size_t dstlen; @@ -1159,9 +1161,11 @@ int send_packet(NpingTarget *target, int rawfd, u8 *pkt, size_t pktLen){ target->getTargetSockAddr(&dst, &dstlen); assert(dst.ss_family == AF_INET); if( o.issetMTU() == true ) - res = send_frag_ip_packet(rawfd, NULL, (struct sockaddr_in *) &dst, pkt, pktLen, o.getMTU() ); + res = send_frag_ip_packet(rawfd, NULL, (struct sockaddr_in *) &dst, pkt, pktLen, o.getMTU() ); //res should always be -1 else res = send_ip_packet_sd(rawfd, (struct sockaddr_in *) &dst, pkt, pktLen); + /*send_ip_packet_sd calls Sendto which returns errors as -1 according to netutil.cc so lets catch that and return OP_FAILURE*/ + if (res == -1) return OP_FAILURE; } } return OP_SUCCESS;