veego 21dea2100c Resolve conflicts.

2000-05-03 11:12:03 +00:00

..

fil.c

Resolve conflicts.

2000-05-03 11:12:03 +00:00

icmp6.h

…

icmp_var.h

…

if_arp.c

…

if_atm.c

…

if_atm.h

…

if_ether.h

…

if_inarp.h

…

igmp_var.h

…

igmp.c

…

igmp.h

…

in4_cksum.c

…

in_cksum.c

…

in_gif.c

sync with more recent kame. defer inclusion of net/if_gif.h.

2000-04-26 05:36:41 +00:00

in_gif.h

introduce sys/netinet/ip_encap.c, to dispatch inbound packets

2000-04-19 06:30:51 +00:00

in_pcb.c

…

in_pcb.h

…

in_proto.c

introduce sys/netinet/ip_encap.c, to dispatch inbound packets

2000-04-19 06:30:51 +00:00

in_systm.h

…

in_var.h

…

in.c

…

in.h

…

ip6.h

…

ip_auth.c

Resolve conflicts.

2000-05-03 11:12:03 +00:00

ip_auth.h

Resolve conflicts.

2000-05-03 11:12:03 +00:00

ip_compat.h

Resolve conflicts.

2000-05-03 11:12:03 +00:00

ip_ecn.c

…

ip_ecn.h

…

ip_encap.c

introduce sys/netinet/ip_encap.c, to dispatch inbound packets

2000-04-19 06:30:51 +00:00

ip_encap.h

introduce sys/netinet/ip_encap.c, to dispatch inbound packets

2000-04-19 06:30:51 +00:00

ip_fil.c

Resolve conflicts.

2000-05-03 11:12:03 +00:00

ip_fil.h

Resolve conflicts.

2000-05-03 11:12:03 +00:00

ip_flow.c

…

ip_frag.c

Resolve conflicts.

2000-05-03 11:12:03 +00:00

ip_frag.h

Resolve conflicts.

2000-05-03 11:12:03 +00:00

ip_ftp_pxy.c

Resolve conflicts.

2000-05-03 11:12:03 +00:00

ip_gre.c

…

ip_gre.h

…

ip_icmp.c

…

ip_icmp.h

…

ip_input.c

…

ip_ipip.c

introduce sys/netinet/ip_encap.c, to dispatch inbound packets

2000-04-19 06:30:51 +00:00

ip_ipip.h

introduce sys/netinet/ip_encap.c, to dispatch inbound packets

2000-04-19 06:30:51 +00:00

ip_log.c

Resolve conflicts.

2000-05-03 11:12:03 +00:00

ip_mroute.c

introduce sys/netinet/ip_encap.c, to dispatch inbound packets

2000-04-19 06:30:51 +00:00

ip_mroute.h

…

ip_nat.c

Resolve conflicts.

2000-05-03 11:12:03 +00:00

ip_nat.h

Resolve conflicts.

2000-05-03 11:12:03 +00:00

ip_output.c

…

ip_proxy.c

Resolve conflicts.

2000-05-03 11:12:03 +00:00

ip_proxy.h

Resolve conflicts.

2000-05-03 11:12:03 +00:00

ip_raudio_pxy.c

Resolve conflicts.

2000-05-03 11:12:03 +00:00

ip_rcmd_pxy.c

Resolve conflicts.

2000-05-03 11:12:03 +00:00

ip_state.c

Resolve conflicts.

2000-05-03 11:12:03 +00:00

ip_state.h

Resolve conflicts.

2000-05-03 11:12:03 +00:00

ip_var.h

…

ip.h

One more __attribute__((__packed__)) to dissuade egcs from making

2000-05-02 14:15:07 +00:00

ipl.h

Resolve conflicts.

2000-05-03 11:12:03 +00:00

Makefile

add net/if_stf.h and netinet/ip_encap.h (almost noone will include them though)

2000-04-19 06:39:15 +00:00

raw_ip.c

…

tcp_debug.c

…

tcp_debug.h

…

tcp_fsm.h

…

tcp_input.c

…

tcp_output.c

…

tcp_seq.h

…

tcp_subr.c

…

tcp_timer.c

…

tcp_timer.h

…

tcp_usrreq.c

…

tcp_var.h

…

tcp.h

…

tcpip.h

…

udp_usrreq.c

…

udp_var.h

…

udp.h

…