2012-07-16 03:39:31 -04:00
|
|
|
$OpenBSD: patch-nping_EchoServer_cc,v 1.3 2012/07/16 07:39:31 giovanni Exp $
|
|
|
|
|
--- nping/EchoServer.cc.orig Thu Mar 1 07:53:35 2012
|
|
|
|
|
+++ nping/EchoServer.cc Wed Jul 11 15:20:46 2012
|
|
|
|
|
@@ -840,7 +840,7 @@ int EchoServer::nep_capture_handler(nsock_pool nsp, ns
|
2011-03-28 05:01:24 -04:00
|
|
|
const unsigned char *packet=NULL;
|
|
|
|
|
const unsigned char *link=NULL;
|
|
|
|
|
nsock_iod nsi = nse_iod(nse);
|
|
|
|
|
- struct timeval pcaptime;
|
|
|
|
|
+ struct bpf_timeval pcaptime;
|
|
|
|
|
nsock_iod clnt_iod=NULL;
|
|
|
|
|
NEPContext *ctx=NULL;
|
|
|
|
|
EchoHeader pkt_out;
|
2012-07-16 03:39:31 -04:00
|
|
|
@@ -1421,9 +1421,9 @@ int EchoServer::start() {
|
|
|
|
|
/* Set nsock trace level */
|
|
|
|
|
gettimeofday(&now, NULL);
|
|
|
|
|
if( o.getDebugging() == DBG_5)
|
|
|
|
|
- nsp_settrace(nsp, NULL, 1 , &now);
|
|
|
|
|
+ nsp_settrace(nsp, NULL, 1 , (const bpf_timeval*)&now);
|
|
|
|
|
else if( o.getDebugging() > DBG_5 )
|
|
|
|
|
- nsp_settrace(nsp, NULL, 10 , &now);
|
|
|
|
|
+ nsp_settrace(nsp, NULL, 10 , (const bpf_timeval*)&now);
|
|
|
|
|
|
|
|
|
|
/* Create new IOD for pcap */
|
|
|
|
|
if ((pcap_nsi = nsi_new(nsp, NULL)) == NULL)
|
