You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
48 lines
1.3 KiB
48 lines
1.3 KiB
--- cdpr.c.orig Wed Nov 19 17:53:13 2003 |
|
+++ cdpr.c Wed Nov 19 17:54:06 2003 |
|
@@ -639,7 +639,7 @@ |
|
pcap_lookupnet(dev, &net, &mask, errbuf); |
|
|
|
/* Open the pcap device */ |
|
- if((handle = pcap_open_live(dev, BUFSIZ, 1, 0, errbuf)) == NULL) |
|
+ if((handle = pcap_open_live(dev, BUFSIZ, 1, 1000, errbuf)) == NULL) |
|
{ |
|
printf("Error opening device (%s)\n", errbuf); |
|
exit(1); |
|
@@ -656,11 +656,6 @@ |
|
pcap_setfilter(handle, &filter); |
|
pcap_freecode(&filter); |
|
|
|
- /* Set non-blocking mode */ |
|
- if(pcap_setnonblock(handle, 1, errbuf)) |
|
- { |
|
- pcap_perror(handle, NULL); |
|
- } |
|
|
|
/* Get the next packet that comes in, we only need one */ |
|
printf("Waiting for CDP advertisement:\n"); |
|
@@ -671,11 +666,7 @@ |
|
do |
|
{ |
|
packet = pcap_next(handle, &header); |
|
-#ifdef WIN32 |
|
- Sleep(10000); |
|
-#else |
|
- usleep(10000); |
|
-#endif |
|
+ |
|
} while ((!packet) && ( timeout=((start_time+seconds) > (unsigned int)time(NULL))) ); |
|
|
|
/* |
|
Index: Makefile |
|
--- Makefile.orig 2003-10-23 01:18:47.000000000 +0200 |
|
+++ Makefile 2003-12-13 14:34:47.000000000 +0100 |
|
@@ -17,7 +17,7 @@ |
|
#LDFLAGS = -lsocket -lnsl -lpcap |
|
|
|
cdpr: cdpr.c cdprs.c conffile.c cdp.h cdpr.h |
|
- gcc $(CFLAGS) cdpr.c cdprs.c conffile.c $(LDFLAGS) -o cdpr |
|
+ $(CC) $(CFLAGS) cdpr.c cdprs.c conffile.c $(LDFLAGS) -o cdpr $(LIBS) |
|
|
|
clean: |
|
rm -f cdpr
|
|
|