Attachment #117026 for bug #159078

View | Details | Raw Unified | Return to bug 159078
Collapse All | Expand All

Lines 7-13 Link Here

(-)/home/iamben/tmp/ports/security/knock/Makefile (-1 / +1 lines)
7		7
8	PORTNAME= knock	8	PORTNAME= knock
9	PORTVERSION= 0.5.20051124	9	PORTVERSION= 0.5.20051124
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= security	11	CATEGORIES= security
12	MASTER_SITES= ${MASTER_SITE_LOCAL}	12	MASTER_SITES= ${MASTER_SITE_LOCAL}
13	MASTER_SITE_SUBDIR= shaun	13	MASTER_SITE_SUBDIR= shaun




 #else
 	cap = pcap_open_live(o_int, 65535, 0, 0, pcapErr);
 #endif	
@@ -222,6 +222,9 @@
 		case DLT_RAW:
 			dprint("raw interface detected, no encapsulation\n");
 			break;
+		case DLT_NULL:
+			dprint("tun interface detected. pppoe on freebsd\n");
+			break;
 		default: 
 			fprintf(stderr, "error: unsupported link-layer type: %d\n", lltype);
 			cleanup(1);
@@ -1209,6 +1212,8 @@
 		ip = (struct ip*)((u_char*)packet + 16);
 	} else if(lltype == DLT_RAW) {
 		ip = (struct ip*)((u_char*)packet);
+	} else if(lltype == DLT_NULL) {
+		ip = (struct ip*)((u_char*)packet + 4);
 	}
 
 	if(ip->ip_v != 4) {

Return to bug 159078

Lines 9-11 Link Here

(-)/home/iamben/tmp/ports/security/knock/files/patch-src-knockd.c (+19 lines)
9	#else	9	#else
10	cap = pcap_open_live(o_int, 65535, 0, 0, pcapErr);	10	cap = pcap_open_live(o_int, 65535, 0, 0, pcapErr);
11	#endif	11	#endif
		12	@@ -222,6 +222,9 @@
		13	case DLT_RAW:
		14	dprint("raw interface detected, no encapsulation\n");
		15	break;
		16	+ case DLT_NULL:
		17	+ dprint("tun interface detected. pppoe on freebsd\n");
		18	+ break;
		19	default:
		20	fprintf(stderr, "error: unsupported link-layer type: %d\n", lltype);
		21	cleanup(1);
		22	@@ -1209,6 +1212,8 @@
		23	ip = (struct ip)((u_char)packet + 16);
		24	} else if(lltype == DLT_RAW) {
		25	ip = (struct ip)((u_char)packet);
		26	+ } else if(lltype == DLT_NULL) {
		27	+ ip = (struct ip)((u_char)packet + 4);
		28	}
		29
		30	if(ip->ip_v != 4) {