From a4087cd37afd28c5ecf7583f5908bf2d6d4b9dfa Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 4 Jan 2009 00:21:24 +0000 Subject: ead: fix bridge handling mistakes git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13846 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/ead/src/ead.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'package') diff --git a/package/ead/src/ead.c b/package/ead/src/ead.c index c4d3dd9f41..b6a9310f0f 100644 --- a/package/ead/src/ead.c +++ b/package/ead/src/ead.c @@ -622,22 +622,21 @@ ead_pcap_reopen(bool first) { static char errbuf[PCAP_ERRBUF_SIZE] = ""; - if (pcap_fp_rx != pcap_fp) + if (pcap_fp_rx && (pcap_fp_rx != pcap_fp)) pcap_close(pcap_fp_rx); if (pcap_fp) pcap_close(pcap_fp); - pcap_fp_rx = pcap_fp; + pcap_fp_rx = NULL; do { pcap_fp = pcap_open_live(ifname, PCAP_MRU, 1, PCAP_TIMEOUT, errbuf); #ifdef linux - if (brname) { + if (brname) pcap_fp_rx = pcap_open_live(brname, PCAP_MRU, 1, PCAP_TIMEOUT, errbuf); - if (!pcap_fp_rx) - pcap_fp_rx = pcap_fp; - } #endif + if (!pcap_fp_rx) + pcap_fp_rx = pcap_fp; pcap_setfilter(pcap_fp_rx, &pktfilter); if (first && !pcap_fp) { DEBUG(1, "WARNING: unable to open interface '%s'\n", ifname); -- cgit v1.2.3