Update of /project/movitz/cvsroot/movitz/losp/lib/net In directory common-lisp.net:/tmp/cvs-serv31787

Modified Files: ip4.lisp Log Message: Changed default network addresses in ip4-init (i.e. my lab changed network).

Date: Tue Apr 19 08:50:04 2005 Author: ffjeld

Index: movitz/losp/lib/net/ip4.lisp diff -u movitz/losp/lib/net/ip4.lisp:1.16 movitz/losp/lib/net/ip4.lisp:1.17 --- movitz/losp/lib/net/ip4.lisp:1.16 Thu Dec 9 00:40:03 2004 +++ movitz/losp/lib/net/ip4.lisp Tue Apr 19 08:50:04 2005 @@ -1,6 +1,6 @@ ;;;;------------------------------------------------------------------ ;;;; -;;;; Copyright (C) 2001, 2003-2004, +;;;; Copyright (C) 2001, 2003-2005, ;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld frodef@acm.org ;;;; Created at: Wed Apr 30 13:52:57 2003 ;;;; -;;;; $Id: ip4.lisp,v 1.16 2004/12/08 23:40:03 ffjeld Exp $ +;;;; $Id: ip4.lisp,v 1.17 2005/04/19 06:50:04 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------

@@ -480,7 +480,7 @@ (setf *ne2000* nil)) (values))

-(defun ip4-init () +(defun ip4-init (&optional (ip :129.242.19.151) (router :129.242.19.129)) (unless *ip4-nic* (let ((ethernet (some #'muerte.x86-pc.ne2k:ne2k-probe @@ -488,9 +488,9 @@ (assert ethernet ethernet "No ethernet device.") (setf *ip4-nic* ethernet))) (unless *ip4-ip* - (setf *ip4-ip* (ip4-address :129.242.16.173))) + (setf *ip4-ip* (ip4-address ip))) (unless *ip4-router* - (setf *ip4-router* (ip4-address :129.242.16.1))) + (setf *ip4-router* (ip4-address router))) ;; This is to announce our presence on the LAN.. (assert (polling-arp *ip4-router* (lambda () (eql #\space (muerte.x86-pc.keyboard:poll-char))))