change log for rtems (2011-02-24)
rtems-vc at rtems.org
rtems-vc at rtems.org
Thu Feb 24 15:10:48 UTC 2011
*ralf*:
2011-02-24 Ralf Corsépius <ralf.corsepius at 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>.
M 1.2741 cpukit/ChangeLog
M 1.6 cpukit/libnetworking/netinet/ip_icmp.h
M 1.15 cpukit/libnetworking/netinet/ip_icmp.c
M 1.12 cpukit/libnetworking/netinet/tcp_var.h
diff -u rtems/cpukit/ChangeLog:1.2740 rtems/cpukit/ChangeLog:1.2741
--- rtems/cpukit/ChangeLog:1.2740 Thu Feb 24 00:48:51 2011
+++ rtems/cpukit/ChangeLog Thu Feb 24 08:57:33 2011
@@ -1,5 +1,11 @@
2011-02-24 Ralf Corsépius <ralf.corsepius at 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>.
+
+2011-02-24 Ralf Corsépius <ralf.corsepius at rtems.org>
+
* libnetworking/netinet/in_systm.h,
libnetworking/netinet/tcp_debug.c,
libnetworking/netinet/tcp_debug.h, libnetworking/netinet/tcp_seq.h,
diff -u rtems/cpukit/libnetworking/netinet/ip_icmp.h:1.5 rtems/cpukit/libnetworking/netinet/ip_icmp.h:1.6
--- rtems/cpukit/libnetworking/netinet/ip_icmp.h:1.5 Sat May 21 08:44:25 2005
+++ rtems/cpukit/libnetworking/netinet/ip_icmp.h Thu Feb 24 08:57:34 2011
@@ -54,22 +54,22 @@
* Structure of an icmp header.
*/
struct icmp {
- u_char icmp_type; /* type of message, see below */
- u_char icmp_code; /* type sub code */
- u_short icmp_cksum; /* ones complement cksum of struct */
+ u_char icmp_type; /* type of message, see below */
+ u_char icmp_code; /* type sub code */
+ u_short icmp_cksum; /* ones complement cksum of struct */
union {
u_char ih_pptr; /* ICMP_PARAMPROB */
struct in_addr ih_gwaddr; /* ICMP_REDIRECT */
struct ih_idseq {
- n_short icd_id;
- n_short icd_seq;
+ uint16_t icd_id; /* network format */
+ uint16_t icd_seq; /* network format */
} ih_idseq;
int ih_void;
/* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */
struct ih_pmtu {
- n_short ipm_void;
- n_short ipm_nextmtu;
+ uint16_t ipm_void; /* network format */
+ uint16_t ipm_nextmtu; /* network format */
} ih_pmtu;
struct ih_rtradv {
@@ -90,16 +90,20 @@
#define icmp_lifetime icmp_hun.ih_rtradv.irt_lifetime
union {
struct id_ts { /* ICMP Timestamp */
- n_time its_otime; /* Originate */
- n_time its_rtime; /* Receive */
- n_time its_ttime; /* Transmit */
+ /*
+ * The next 3 fields are in network format,
+ * milliseconds since 00:00 GMT
+ */
+ uint32_t its_otime; /* Originate */
+ uint32_t its_rtime; /* Receive */
+ uint32_t its_ttime; /* Transmit */
} id_ts;
struct id_ip {
struct ip idi_ip;
/* options and then 64 bits of data */
} id_ip;
struct icmp_ra_addr id_radv;
- u_int32_t id_mask;
+ u_int32_t id_mask;
char id_data[1];
} icmp_dun;
#define icmp_otime icmp_dun.id_ts.its_otime
@@ -120,7 +124,7 @@
* ip header length.
*/
#define ICMP_MINLEN 8 /* abs minimum */
-#define ICMP_TSLEN (8 + 3 * sizeof (n_time)) /* timestamp */
+#define ICMP_TSLEN (8 + 3 * sizeof (uint32_t)) /* timestamp */
#define ICMP_MASKLEN 12 /* address mask */
#define ICMP_ADVLENMIN (8 + sizeof (struct ip) + 8) /* min */
#ifndef _IP_VHL
diff -u rtems/cpukit/libnetworking/netinet/ip_icmp.c:1.14 rtems/cpukit/libnetworking/netinet/ip_icmp.c:1.15
--- rtems/cpukit/libnetworking/netinet/ip_icmp.c:1.14 Sun Mar 28 00:47:49 2010
+++ rtems/cpukit/libnetworking/netinet/ip_icmp.c Thu Feb 24 08:57:34 2011
@@ -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 @@
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 @@
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 @@
}
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 @@
RTFREE(ro.ro_rt);
}
-n_time
+/*
+ * Return milliseconds since 00:00 GMT in network format.
+ */
+uint32_t
iptime(void)
{
struct timeval atv;
diff -u rtems/cpukit/libnetworking/netinet/tcp_var.h:1.11 rtems/cpukit/libnetworking/netinet/tcp_var.h:1.12
--- rtems/cpukit/libnetworking/netinet/tcp_var.h:1.11 Thu Feb 24 00:48:52 2011
+++ rtems/cpukit/libnetworking/netinet/tcp_var.h Thu Feb 24 08:57:34 2011
@@ -44,6 +44,8 @@
*/
#ifdef __BSD_VISIBLE
+#include <netinet/tcp_timer.h> /* TCPT_NTIMERS */
+
/*
* Tcp control block, one per tcp; fields:
*/
*ralf*:
Add missing includes.
M 1.29 cpukit/posix/include/rtems/posix/mqueue.h
M 1.22 cpukit/posix/include/rtems/posix/timer.h
diff -u rtems/cpukit/posix/include/rtems/posix/mqueue.h:1.28 rtems/cpukit/posix/include/rtems/posix/mqueue.h:1.29
--- rtems/cpukit/posix/include/rtems/posix/mqueue.h:1.28 Wed Feb 23 08:34:34 2011
+++ rtems/cpukit/posix/include/rtems/posix/mqueue.h Thu Feb 24 09:09:54 2011
@@ -20,7 +20,7 @@
#define _RTEMS_POSIX_MQUEUE_H
#include <signal.h>
-
+#include <mqueue.h> /* struct mq_attr */
#include <rtems/score/coremsg.h>
#include <rtems/score/object.h>
diff -u rtems/cpukit/posix/include/rtems/posix/timer.h:1.21 rtems/cpukit/posix/include/rtems/posix/timer.h:1.22
--- rtems/cpukit/posix/include/rtems/posix/timer.h:1.21 Mon Nov 30 09:44:20 2009
+++ rtems/cpukit/posix/include/rtems/posix/timer.h Thu Feb 24 09:09:54 2011
@@ -18,6 +18,7 @@
#include <rtems/posix/config.h>
#include <rtems/score/object.h>
+#include <rtems/score/watchdog.h> /* Watchdog_Control */
#ifdef __cplusplus
extern "C" {
*ralf*:
2011-02-24 Ralf Corsépius <ralf.corsepius at rtems.org>
* posix/include/rtems/posix/mqueue.h,
posix/include/rtems/posix/timer.h: Add missing includes.
M 1.2742 cpukit/ChangeLog
diff -u rtems/cpukit/ChangeLog:1.2741 rtems/cpukit/ChangeLog:1.2742
--- rtems/cpukit/ChangeLog:1.2741 Thu Feb 24 08:57:33 2011
+++ rtems/cpukit/ChangeLog Thu Feb 24 09:10:06 2011
@@ -1,5 +1,10 @@
2011-02-24 Ralf Corsépius <ralf.corsepius at rtems.org>
+ * posix/include/rtems/posix/mqueue.h,
+ posix/include/rtems/posix/timer.h: Add missing includes.
+
+2011-02-24 Ralf Corsépius <ralf.corsepius at 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>.
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110224/318f45b9/attachment-0001.html>
More information about the vc
mailing list