change log for network-demos (2011-03-04)

[rtems-vc at rtems.org]

 *joel* (on branch network-demos-4-10-branch):
2011-03-04	Joel Sherrill <joel.sherrilL at OARcorp.com>

	* networkconfig-qemu.h: VirtualBox uses 10.0.x.x for its eth0 so we
	need to switch to 10.1.x.x for things to work.
	* networkconfig-loopback.h: New file.

M 1.34.2.2  ChangeLog
M 1.1.2.2  networkconfig-loopback.h
M 1.6.2.1  networkconfig-qemu.h

diff -u network-demos/ChangeLog:1.34.2.1 network-demos/ChangeLog:1.34.2.2
--- network-demos/ChangeLog:1.34.2.1	Tue Feb  8 10:48:35 2011
+++ network-demos/ChangeLog	Fri Mar  4 08:48:14 2011
@@ -1,3 +1,9 @@
+2011-03-04	Joel Sherrill <joel.sherrilL at OARcorp.com>
+
+	* networkconfig-qemu.h: VirtualBox uses 10.0.x.x for its eth0 so we
+	need to switch to 10.1.x.x for things to work.
+	* networkconfig-loopback.h: New file.
+
 2011-02-08	Joel Sherrill <joel.sherrilL at OARcorp.com>
 
 	* VERSION: Updated to network-demos-4.10.0.

diff -u /dev/null network-demos/networkconfig-loopback.h:1.1.2.2
--- /dev/null	Fri Mar  4 09:10:04 2011
+++ network-demos/networkconfig-loopback.h	Fri Mar  4 08:48:14 2011
@@ -0,0 +1,89 @@
+/*
+ * Network configuration -- LOOPBACK ONLY!!!
+ *
+ * See one of the other networkconfig.h files for an
+ * example of a system that includes a real NIC and
+ * the loopback interface.
+ * 
+ ************************************************************
+ * EDIT THIS FILE TO REFLECT YOUR NETWORK CONFIGURATION     *
+ * BEFORE RUNNING ANY RTEMS PROGRAMS WHICH USE THE NETWORK! * 
+ ************************************************************
+ *
+ *  $Id$
+ */
+
+#ifndef _RTEMS_NETWORKCONFIG_H_
+#define _RTEMS_NETWORKCONFIG_H_
+
+
+/* #define RTEMS_USE_BOOTP */
+
+#include <bsp.h>
+
+/*
+ * Loopback interface
+ */
+extern int rtems_bsdnet_loopattach();
+
+/*
+ * Default network interface
+ */
+static struct rtems_bsdnet_ifconfig netdriver_config = {
+  "lo0",                    /* name */
+  rtems_bsdnet_loopattach,  /* attach function */
+  NULL,                     /* No more interfaces */
+  "127.0.0.1",              /* IP address */
+  "255.0.0.0",              /* IP net mask */
+  NULL,                     /* Driver supplies hardware address */
+  0,                        /* Use default driver parameters */
+  0,                        /* default efficiency multiplier */
+  0,                        /* default udp TX socket buffer size */
+  0,                        /* default udp RX socket buffer size */
+  0,                        /* default tcp TX socket buffer size */
+  0,                        /* default tcp RX socket buffer size */
+};
+
+/*
+ * Network configuration
+ */
+struct rtems_bsdnet_config rtems_bsdnet_config = {
+  &netdriver_config,
+  NULL,                /* do not use bootp */
+  0,                   /* Default network task priority */
+  0,                   /* Default mbuf capacity */
+  0,                   /* Default mbuf cluster capacity */
+  "rtems",             /* Host name */
+  "nodomain.com",      /* Domain name */
+  "127.0.0.1",         /* Gateway */
+  "127.0.0.1",         /* Log host */
+  {"127.0.0.1" },      /* Name server(s) */
+  {"127.0.0.1" },      /* NTP server(s) */
+  0,                   /* sb_efficiency */
+  0,                   /* udp_tx_buf_size */
+  0,                   /* udp_rx_buf_size */
+  0,                   /* tcp_tx_buf_size */
+  0                    /* tcp_rx_buf_size */
+
+};
+
+/*
+ * For TFTP test application
+ */
+#if (defined (RTEMS_USE_BOOTP))
+#define RTEMS_TFTP_TEST_HOST_NAME "BOOTP_HOST"
+#define RTEMS_TFTP_TEST_FILE_NAME "BOOTP_FILE"
+#else
+#define RTEMS_TFTP_TEST_HOST_NAME "XXX.YYY.ZZZ.XYZ"
+#define RTEMS_TFTP_TEST_FILE_NAME "tftptest"
+#endif
+
+/*
+ * For NFS test application
+ * 
+ * NFS server/path to mount and a directory to ls once mounted
+ */
+#define RTEMS_NFS_SERVER      "192.168.1.210"
+#define RTEMS_NFS_SERVER_PATH "/home"
+#define RTEMS_NFS_LS_PATH     "/mnt/nfstest"
+#endif /* _RTEMS_NETWORKCONFIG_H_ */

diff -u network-demos/networkconfig-qemu.h:1.6 network-demos/networkconfig-qemu.h:1.6.2.1
--- network-demos/networkconfig-qemu.h:1.6	Wed May 13 13:56:10 2009
+++ network-demos/networkconfig-qemu.h	Fri Mar  4 08:48:14 2011
@@ -115,7 +115,7 @@
 #endif
 
 #if defined(ON_QEMU)
-#define FIXED_IP_ADDR "10.0.2.5"
+#define FIXED_IP_ADDR "10.1.2.5"
 #endif
 
 #if defined(ON_RTEMS_LAB_WINSYSTEMS)



--

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/20110304/68e35e1f/attachment.html>