<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2011-02-24)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>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>.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2740&r2=text&tr2=1.2741&diff_format=h">M</a></td><td width='1%'>1.2741</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libnetworking/netinet/ip_icmp.h.diff?r1=text&tr1=1.5&r2=text&tr2=1.6&diff_format=h">M</a></td><td width='1%'>1.6</td><td width='100%'>cpukit/libnetworking/netinet/ip_icmp.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libnetworking/netinet/ip_icmp.c.diff?r1=text&tr1=1.14&r2=text&tr2=1.15&diff_format=h">M</a></td><td width='1%'>1.15</td><td width='100%'>cpukit/libnetworking/netinet/ip_icmp.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libnetworking/netinet/tcp_var.h.diff?r1=text&tr1=1.11&r2=text&tr2=1.12&diff_format=h">M</a></td><td width='1%'>1.12</td><td width='100%'>cpukit/libnetworking/netinet/tcp_var.h</td></tr>
</table>
<pre>
<font color='#006600'>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
</font><font color='#997700'>@@ -1,5 +1,11 @@
</font> 2011-02-24 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ * 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@rtems.org>
+
</font> * libnetworking/netinet/in_systm.h,<span style="background-color: #FF0000"> </span>
libnetworking/netinet/tcp_debug.c,
libnetworking/netinet/tcp_debug.h, libnetworking/netinet/tcp_seq.h,
<font color='#006600'>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
</font><font color='#997700'>@@ -54,22 +54,22 @@
</font> * Structure of an icmp header.
*/
struct icmp {
<font color='#880000'>- 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 */
</font><font color='#000088'>+ 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 */
</font> union {
u_char ih_pptr; /* ICMP_PARAMPROB */
struct in_addr ih_gwaddr; /* ICMP_REDIRECT */
struct ih_idseq {
<font color='#880000'>- n_short icd_id;
- n_short icd_seq;
</font><font color='#000088'>+ uint16_t icd_id; /* network format */
+ uint16_t icd_seq; /* network format */
</font> } ih_idseq;
int ih_void;
/* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */
struct ih_pmtu {
<font color='#880000'>- n_short ipm_void;
- n_short ipm_nextmtu;
</font><font color='#000088'>+ uint16_t ipm_void; /* network format */
+ uint16_t ipm_nextmtu; /* network format */
</font> } ih_pmtu;
struct ih_rtradv {
<font color='#997700'>@@ -90,16 +90,20 @@
</font> #define icmp_lifetime icmp_hun.ih_rtradv.irt_lifetime
union {
struct id_ts { /* ICMP Timestamp */
<font color='#880000'>- n_time its_otime; /* Originate */
- n_time its_rtime; /* Receive */
- n_time its_ttime; /* Transmit */
</font><font color='#000088'>+ /*
+ * 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 */
</font> } id_ts;
struct id_ip {
struct ip idi_ip;
/* options and then 64 bits of data */
} id_ip;
struct icmp_ra_addr id_radv;
<font color='#880000'>- u_int32_t id_mask;
</font><font color='#000088'>+ u_int32_t id_mask;
</font> char id_data[1];
} icmp_dun;
#define icmp_otime icmp_dun.id_ts.its_otime
<font color='#997700'>@@ -120,7 +124,7 @@
</font> * ip header length.
*/
#define ICMP_MINLEN 8 /* abs minimum */
<font color='#880000'>-#define ICMP_TSLEN (8 + 3 * sizeof (n_time)) /* timestamp */
</font><font color='#000088'>+#define ICMP_TSLEN (8 + 3 * sizeof (uint32_t)) /* timestamp */
</font> #define ICMP_MASKLEN 12 /* address mask */
#define ICMP_ADVLENMIN (8 + sizeof (struct ip) + 8) /* min */
#ifndef _IP_VHL
<font color='#006600'>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
</font><font color='#997700'>@@ -40,25 +40,28 @@
</font>
#include <sys/param.h>
#include <sys/systm.h>
<font color='#880000'>-#include <sys/malloc.h>
</font> #include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <sys/kernel.h>
<font color='#880000'>-#include <sys/socket.h>
</font> #include <sys/sysctl.h>
#include <net/if.h>
<font color='#000088'>+#include <net/if_types.h>
</font> #include <net/route.h>
#define _IP_VHL
#include <netinet/in.h>
<font color='#000088'>+#include <netinet/in_pcb.h>
</font> #include <netinet/in_systm.h>
#include <netinet/in_var.h>
#include <netinet/ip.h>
#include <netinet/ip_icmp.h>
#include <netinet/ip_var.h>
<font color='#000088'>+#include <netinet/tcp.h>
+#include <netinet/tcp_var.h>
+#include <netinet/tcpip.h>
</font> #include <netinet/icmp_var.h>
#ifdef IPSEC
<font color='#997700'>@@ -96,7 +99,6 @@
</font> SYSCTL_INT(_net_inet_icmp, OID_AUTO, allecho, CTLFLAG_RW, &icmpallecho,
0, "");
<font color='#880000'>-/* #define ICMPPRINTFS 1 */
</font> #ifdef ICMPPRINTFS
int icmpprintfs = 0;
#endif
<font color='#997700'>@@ -254,7 +256,7 @@
</font> goto freeit;
}
i = hlen + min(icmplen, ICMP_ADVLENMIN);
<font color='#880000'>- if (m->m_len < i && (m = m_pullup(m, i)) == 0) {
</font><font color='#000088'>+ if (m->m_len < i && (m = m_pullup(m, i)) == NULL) {
</font> icmpstat.icps_tooshort++;
return;
}
<font color='#997700'>@@ -466,10 +468,11 @@
</font> }
ia = (struct in_ifaddr *)ifaof_ifpforaddr(
(struct sockaddr *)&icmpdst, m->m_pkthdr.rcvif);
<font color='#880000'>- if (ia == 0)
</font><font color='#000088'>+ if (ia == NULL)
</font> break;
<font color='#880000'>- if (ia->ia_ifp == 0)
</font><font color='#000088'>+ if (ia->ia_ifp == NULL) {
</font> break;
<font color='#000088'>+ }
</font> icp->icmp_type = ICMP_MASKREPLY;
icp->icmp_mask = ia->ia_sockmask.sin_addr.s_addr;
if (ip->ip_src.s_addr == 0) {
<font color='#997700'>@@ -717,7 +720,10 @@
</font> RTFREE(ro.ro_rt);
}
<font color='#880000'>-n_time
</font><font color='#000088'>+/*
+ * Return milliseconds since 00:00 GMT in network format.
+ */
+uint32_t
</font> iptime(void)
{
struct timeval atv;
<font color='#006600'>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
</font><font color='#997700'>@@ -44,6 +44,8 @@
</font> */
#ifdef __BSD_VISIBLE
<font color='#000088'>+#include <netinet/tcp_timer.h> /* TCPT_NTIMERS */
+
</font> /*
* Tcp control block, one per tcp; fields:
*/
</pre>
<p> </p>
<a name='cs2'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>Add missing includes.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/posix/include/rtems/posix/mqueue.h.diff?r1=text&tr1=1.28&r2=text&tr2=1.29&diff_format=h">M</a></td><td width='1%'>1.29</td><td width='100%'>cpukit/posix/include/rtems/posix/mqueue.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/posix/include/rtems/posix/timer.h.diff?r1=text&tr1=1.21&r2=text&tr2=1.22&diff_format=h">M</a></td><td width='1%'>1.22</td><td width='100%'>cpukit/posix/include/rtems/posix/timer.h</td></tr>
</table>
<pre>
<font color='#006600'>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
</font><font color='#997700'>@@ -20,7 +20,7 @@
</font> #define _RTEMS_POSIX_MQUEUE_H
#include <signal.h>
<font color='#880000'>-
</font><font color='#000088'>+#include <mqueue.h> /* struct mq_attr */
</font> #include <rtems/score/coremsg.h>
#include <rtems/score/object.h>
<font color='#006600'>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
</font><font color='#997700'>@@ -18,6 +18,7 @@
</font>
#include <rtems/posix/config.h>
#include <rtems/score/object.h>
<font color='#000088'>+#include <rtems/score/watchdog.h> /* Watchdog_Control */
</font>
#ifdef __cplusplus
extern "C" {
</pre>
<p> </p>
<a name='cs3'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-02-24 Ralf Corsépius <ralf.corsepius@rtems.org>
* posix/include/rtems/posix/mqueue.h,
posix/include/rtems/posix/timer.h: Add missing includes.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2741&r2=text&tr2=1.2742&diff_format=h">M</a></td><td width='1%'>1.2742</td><td width='100%'>cpukit/ChangeLog</td></tr>
</table>
<pre>
<font color='#006600'>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
</font><font color='#997700'>@@ -1,5 +1,10 @@
</font> 2011-02-24 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ * posix/include/rtems/posix/mqueue.h,
+ posix/include/rtems/posix/timer.h: Add missing includes.
+
+2011-02-24 Ralf Corsépius <ralf.corsepius@rtems.org>
+
</font> * libnetworking/netinet/ip_icmp.c, libnetworking/netinet/ip_icmp.h:
Misc. changes from FreeBSD.
* libnetworking/netinet/tcp_var.h: Include <netinet/tcp_timer.h>.
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>