From 8d6243980f3b1bfb9c27fbe05357fafce632c3ab Mon Sep 17 00:00:00 2001 From: sean Date: Thu, 21 Jun 2012 01:45:25 +0000 Subject: [PATCH] =?UTF-8?q?Patched=20the=20"ProbeMode.cc:183:25:=20warning?= =?UTF-8?q?:=20variable=20=E2=80=98loopret=E2=80=99=20set=20but=20not=20us?= =?UTF-8?q?ed=20[-Wunused-but-set-variable]"=20by=20added=20error=20handli?= =?UTF-8?q?ng=20for=20the=20NSOCK=5FLOOP=5FERROR=20return=20value.=20Thisb?= =?UTF-8?q?rought=20ProbeMode::start=20inline=20with=20the=20rest=20of=20n?= =?UTF-8?q?map's=20handling=20of=20nsock=5Floop.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nping/ProbeMode.cc | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/nping/ProbeMode.cc b/nping/ProbeMode.cc index 311083cf1..2c8c5660d 100644 --- a/nping/ProbeMode.cc +++ b/nping/ProbeMode.cc @@ -235,9 +235,13 @@ int ProbeMode::start(){ nsock_timer_create(nsp, tcpconnect_event_handler, 1, &pkts2send[pc]); first_time=false; loopret=nsock_loop(nsp, 2); + if (loopret == NSOCK_LOOP_ERROR) + outFatal(QT_3, "Unexpected nsock_loop error.\n"); }else{ nsock_timer_create(nsp, tcpconnect_event_handler, o.getDelay()+1, &pkts2send[pc]); loopret=nsock_loop(nsp, o.getDelay()+1); + if (loopret == NSOCK_LOOP_ERROR) + outFatal(QT_3, "Unexpected nsock_loop error.\n"); } } } @@ -246,6 +250,8 @@ int ProbeMode::start(){ /* If there are some events pending, we'll wait for DEFAULT_WAIT_AFTER_PROBES ms, * otherwise nsock_loop() will return inmediatly */ loopret=nsock_loop(nsp, DEFAULT_WAIT_AFTER_PROBES); + if (loopret == NSOCK_LOOP_ERROR) + outFatal(QT_3, "Unexpected nsock_loop error.\n"); o.stats.stopRxClock(); return OP_SUCCESS; break; /* case TCP_CONNECT */ @@ -283,9 +289,13 @@ int ProbeMode::start(){ nsock_timer_create(nsp, udpunpriv_event_handler, 1, &pkts2send[pc]); first_time=false; loopret=nsock_loop(nsp, 2); + if (loopret == NSOCK_LOOP_ERROR) + outFatal(QT_3, "Unexpected nsock_loop error.\n"); }else{ nsock_timer_create(nsp, udpunpriv_event_handler, o.getDelay(), &pkts2send[pc]); loopret=nsock_loop(nsp, o.getDelay()); + if (loopret == NSOCK_LOOP_ERROR) + outFatal(QT_3, "Unexpected nsock_loop error.\n"); } } } @@ -295,6 +305,8 @@ int ProbeMode::start(){ * otherwise nsock_loop() will return inmediatly */ if(!o.disablePacketCapture()){ loopret=nsock_loop(nsp, DEFAULT_WAIT_AFTER_PROBES); + if (loopret == NSOCK_LOOP_ERROR) + outFatal(QT_3, "Unexpected nsock_loop error.\n"); } o.stats.stopRxClock(); return OP_SUCCESS; @@ -393,9 +405,13 @@ int ProbeMode::start(){ nsock_timer_create(nsp, nping_event_handler, 1, &pkts2send[pc]); first_time=false; loopret=nsock_loop(nsp, 2); + if (loopret == NSOCK_LOOP_ERROR) + outFatal(QT_3, "Unexpected nsock_loop error.\n"); }else{ nsock_timer_create(nsp, nping_event_handler, o.getDelay(), &pkts2send[pc]); loopret=nsock_loop(nsp, o.getDelay()+1); + if (loopret == NSOCK_LOOP_ERROR) + outFatal(QT_3, "Unexpected nsock_loop error.\n"); } } } @@ -439,9 +455,13 @@ int ProbeMode::start(){ nsock_timer_create(nsp, nping_event_handler, 1, &pkts2send[pc]); first_time=false; loopret=nsock_loop(nsp, 2); + if (loopret == NSOCK_LOOP_ERROR) + outFatal(QT_3, "Unexpected nsock_loop error.\n"); }else{ nsock_timer_create(nsp, nping_event_handler, o.getDelay(), &pkts2send[pc]); loopret=nsock_loop(nsp, o.getDelay()+1); + if (loopret == NSOCK_LOOP_ERROR) + outFatal(QT_3, "Unexpected nsock_loop error.\n"); } } } @@ -454,6 +474,8 @@ int ProbeMode::start(){ nsock_pcap_read_packet(nsp, pcap_nsi, nping_event_handler, DEFAULT_WAIT_AFTER_PROBES, NULL); nsock_timer_create(nsp, nping_event_handler, DEFAULT_WAIT_AFTER_PROBES,NULL); loopret=nsock_loop(nsp, DEFAULT_WAIT_AFTER_PROBES); + if (loopret == NSOCK_LOOP_ERROR) + outFatal(QT_3, "Unexpected nsock_loop error.\n"); o.stats.stopRxClock(); } /* Close opened descriptors */