diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-24 14:57:34 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-24 14:57:34 +0000 |
| commit | ee7f2f7bcc468caeda77c0de0defd0d5f6cdaa18 (patch) | |
| tree | 05943ac52680a6cc59bef2a4fd611571387e6306 /cpukit/libnetworking/netinet/ip_icmp.c | |
| parent | 2011-02-24 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-ee7f2f7bcc468caeda77c0de0defd0d5f6cdaa18.tar.bz2 | |
2011-02-24 Ralf Corsépius <ralf.corsepius@rtems.org>
* libnetworking/netinet/ip_icmp.c, libnetworking/netinet/ip_icmp.h:
Misc. changes from FreeBSD.
* libnetworking/netinet/tcp_var.h: Include <netinet/tcp_timer.h>.
Diffstat (limited to 'cpukit/libnetworking/netinet/ip_icmp.c')
| -rw-r--r-- | cpukit/libnetworking/netinet/ip_icmp.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/cpukit/libnetworking/netinet/ip_icmp.c b/cpukit/libnetworking/netinet/ip_icmp.c index 8c3c0f97d0..1bcd648f66 100644 --- a/cpukit/libnetworking/netinet/ip_icmp.c +++ b/cpukit/libnetworking/netinet/ip_icmp.c @@ -40,25 +40,28 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/protosw.h> #include <sys/socket.h> #include <sys/time.h> #include <sys/kernel.h> -#include <sys/socket.h> #include <sys/sysctl.h> #include <net/if.h> +#include <net/if_types.h> #include <net/route.h> #define _IP_VHL #include <netinet/in.h> +#include <netinet/in_pcb.h> #include <netinet/in_systm.h> #include <netinet/in_var.h> #include <netinet/ip.h> #include <netinet/ip_icmp.h> #include <netinet/ip_var.h> +#include <netinet/tcp.h> +#include <netinet/tcp_var.h> +#include <netinet/tcpip.h> #include <netinet/icmp_var.h> #ifdef IPSEC @@ -96,7 +99,6 @@ static int icmpallecho = 1; SYSCTL_INT(_net_inet_icmp, OID_AUTO, allecho, CTLFLAG_RW, &icmpallecho, 0, ""); -/* #define ICMPPRINTFS 1 */ #ifdef ICMPPRINTFS int icmpprintfs = 0; #endif @@ -254,7 +256,7 @@ icmp_input(struct mbuf *m, int off) goto freeit; } i = hlen + min(icmplen, ICMP_ADVLENMIN); - if (m->m_len < i && (m = m_pullup(m, i)) == 0) { + if (m->m_len < i && (m = m_pullup(m, i)) == NULL) { icmpstat.icps_tooshort++; return; } @@ -466,10 +468,11 @@ icmp_input(struct mbuf *m, int off) } ia = (struct in_ifaddr *)ifaof_ifpforaddr( (struct sockaddr *)&icmpdst, m->m_pkthdr.rcvif); - if (ia == 0) + if (ia == NULL) break; - if (ia->ia_ifp == 0) + if (ia->ia_ifp == NULL) { break; + } icp->icmp_type = ICMP_MASKREPLY; icp->icmp_mask = ia->ia_sockmask.sin_addr.s_addr; if (ip->ip_src.s_addr == 0) { @@ -717,7 +720,10 @@ icmp_send(struct mbuf *m, struct mbuf *opts) RTFREE(ro.ro_rt); } -n_time +/* + * Return milliseconds since 00:00 GMT in network format. + */ +uint32_t iptime(void) { struct timeval atv; |