summaryrefslogtreecommitdiff
path: root/pfinet.old/ethernet.c.rej
blob: 48bd555e73a1e67a25b2cb94364c65ae2dbaf4e8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
***************
*** 26,36 ****
  #include <device/net_status.h>
  #include <netinet/in.h>
  #include <string.h>
  #include <error.h>
  
  #include <linux/netdevice.h>
  #include <linux/etherdevice.h>
  #include <linux/if_arp.h>
  
  
  struct port_class *etherreadclass;
--- 26,39 ----
  #include <device/net_status.h>
  #include <netinet/in.h>
  #include <string.h>
+ #define _HACK_ERRNO_H
+ #include <errno.h>
  #include <error.h>
  
  #include <linux/netdevice.h>
  #include <linux/etherdevice.h>
  #include <linux/if_arp.h>
+ #include <device/bpf.h>
  
  
  struct port_class *etherreadclass;
***************
*** 68,82 ****
  {
  }
  
- static short ether_filter[] =
  {
- #ifdef NETF_IN
-   /* We have to tell the packet filtering code that we're interested in
-      incoming packets.  */
-   NETF_IN, /* Header.  */
- #endif
-   NETF_PUSHLIT | NETF_NOP,
-   1
  };
  static int ether_filter_len = sizeof (ether_filter) / sizeof (short);
  
--- 71,85 ----
  {
  }
  
+ /* The BPF instruction allows IP and ARP packets */
+ static struct bpf_insn ether_filter[] =
  {
+     {NETF_IN|NETF_BPF, /* Header. */ 0, 0, 0},
+     {40, 0, 0, 12},
+     {21, 1, 0, 2054},
+     {21, 0, 1, 2048},
+     {6, 0, 0, 1500},
+     {6, 0, 0, 0}
  };
  static int ether_filter_len = sizeof (ether_filter) / sizeof (short);
  
***************
*** 166,176 ****
  
    mach_port_set_qlimit (mach_task_self (), edev->readptname, MACH_PORT_QLIMIT_MAX);
  
-   err = get_privileged_ports (0, &master_device);
-   if (err)
-     error (2, err, "cannot get device master port");
  
-   err = device_open (master_device, D_WRITE | D_READ, dev->name, &edev->ether_port);
    mach_port_deallocate (mach_task_self (), master_device);
    if (err)
      error (2, err, "%s", dev->name);
--- 169,180 ----
  
    mach_port_set_qlimit (mach_task_self (), edev->readptname, MACH_PORT_QLIMIT_MAX);
  
+   /* The device name here is the path of a device file.  */
+   master_device = file_name_lookup (dev->name, 0, 0);
+   if (master_device == MACH_PORT_NULL)
+     error (2, errno, "file_name_lookup %s", dev->name);
  
+   err = device_open (master_device, D_WRITE | D_READ, "eth", &edev->ether_port);
    mach_port_deallocate (mach_task_self (), master_device);
    if (err)
      error (2, err, "%s", dev->name);