OpenBIOS August 2007

openbios@openbios.org

12 participants
103 discussions

r536 - dev/olpc/kb3700
by svn＠openbios.org 15 Aug '07

15 Aug '07

Author: rsmith Date: 2007-08-15 04:28:29 +0200 (Wed, 15 Aug 2007) New Revision: 536 Modified: dev/olpc/kb3700/battery.fth Log: OLPC: Remove some spaces from .bat so that the output will fit on a sigle line OLPL: Prior to when the EC firmware reads the mfg info and battery type from the battery EEPROM or when there is no battery it sets these values to zero make the status indicators just print blanks for zero. Modified: dev/olpc/kb3700/battery.fth =================================================================== --- dev/olpc/kb3700/battery.fth 2007-08-14 19:03:40 UTC (rev 535) +++ dev/olpc/kb3700/battery.fth 2007-08-15 02:28:29 UTC (rev 536) @@ -58,12 +58,14 @@ : .bat-type ( -- ) bat-type@ dup 4 rshift case ( type ) + 0 of ." " endof 1 of ." GPB " endof 2 of ." BYD " endof ." UnknownVendor " endcase ( type ) h# 0f and case ( ) + 0 of ." " endof 1 of ." NiMH " endof 2 of ." LiFePO4 " endof ." UnknownType " @@ -79,16 +81,16 @@ : .% ( n -- ) 2.d ." %" ; : .bat ( -- ) bat-status@ ( stat ) - ." AC: " dup h# 10 and if ." on " else ." off " then ( stat ) - ." PCB: " pcb-temp 2.d ." C " + ." AC: " dup h# 10 and if ." on " else ." off " then ( stat ) + ." PCB: " pcb-temp 2.d ." C " dup 1 and if ." Battery: " .bat-type - soc .% ." " - uvolt@ .milli ." V " - cur@ .milli ." A " - bat-temp 2.d ." C " + soc .% ." " + uvolt@ .milli ." V " + cur@ .milli ." A " + bat-temp 2.d ." C " dup 2 and if ." full " then dup 4 and if ." low " then dup 8 and if ." error " then

1 0

r535 - cpu/x86/pc/olpc
by svn＠openbios.org 14 Aug '07

14 Aug '07

Author: wmb Date: 2007-08-14 21:03:40 +0200 (Tue, 14 Aug 2007) New Revision: 535 Added: cpu/x86/pc/olpc/nandstat.fth Modified: cpu/x86/pc/olpc/copynand.fth Log: OLPC copy-nand - graphic display of progress. Modified: cpu/x86/pc/olpc/copynand.fth =================================================================== --- cpu/x86/pc/olpc/copynand.fth 2007-08-14 16:05:09 UTC (rev 534) +++ cpu/x86/pc/olpc/copynand.fth 2007-08-14 19:03:40 UTC (rev 535) @@ -17,6 +17,8 @@ : >crc ( index -- crc ) crc-buf swap la+ l@ ; +: $call-nand ( ?? method$ -- ?? ) nandih $call-method ; + : close-nand-ihs ( -- ) fileih ?dup if 0 to fileih close-dev 0 to #image-eblocks then nandih ?dup if 0 to nandih close-dev 0 to #nand-pages then @@ -44,11 +46,11 @@ : open-nand ( -- ) " /nandflash" open-dev to nandih nandih 0= " Can't open NAND FLASH device" ?nand-abort - " erase-size" nandih $call-method to /nand-block - " block-size" nandih $call-method to /nand-page - " size" nandih $call-method /nand-page um/mod nip to #nand-pages + " erase-size" $call-nand to /nand-block + " block-size" $call-nand to /nand-page + " size" $call-nand /nand-page um/mod nip to #nand-pages /nand-block /nand-page / to nand-pages/block - " start-scan" nandih $call-method + " start-scan" $call-nand ; h# 20 buffer: line-buf @@ -131,6 +133,34 @@ #crc-records if check-mem-crc else drop then ; +defer show-erasing ( #blocks -- ) +: (show-erasing) ( #blocks -- ) ." Erasing " . ." blocks" cr ; +' (show-erasing) is show-erasing + +defer show-erased +: (show-erased) ( block# -- ) (cr . ; +' (show-erased) is show-erased + +defer show-bad +: (show-bad) ( block# -- ) drop ; +' (show-bad) is show-bad + +defer show-clean +: (show-clean) ( block# -- ) drop ; +' (show-clean) is show-clean + +defer show-cleaning +: (show-cleaning) ( -- ) cr ." Cleanmarkers" cr ; +' (show-cleaning) is show-cleaning + +defer show-writing ( #blocks -- ) +: (show-writing) ." Writing " . ." blocks" cr ; +' (show-writing) is show-writing + +defer show-written +: (show-written) ( block# -- ) (cr . ; +' (show-written) is show-written + : copy-nand ( "devspec" -- ) open-nand get-img-filename @@ -139,21 +169,21 @@ ['] noop to show-progress - ." Erasing..." cr - " wipe" nandih $call-method + #nand-pages nand-pages/block / show-erasing + ['] show-bad ['] show-erased " (wipe)" $call-nand - cr ." Writing " #image-eblocks . ." blocks" cr + #image-eblocks show-writing #image-eblocks 0 ?do - (cr i . read-image-block i ?check-crc - load-base " copy-block" nandih $call-method ( error? ) - " Error writing to NAND FLASH" ?nand-abort + load-base " copy-block" $call-nand ( page# error? ) + " Error writing to NAND FLASH" ?nand-abort ( page# ) + nand-pages/block / show-written ( ) loop - cr ." Filling with cleanmarkers ..." - " put-cleanmarkers" nandih $call-method cr + show-cleaning + ['] show-clean " put-cleanmarkers" $call-nand close-nand-ihs ; @@ -169,10 +199,10 @@ #image-eblocks 0 ?do (cr i . read-image-block - load-base /nand-block + " read-next-block" nandih $call-method ( ) + load-base /nand-block + " read-next-block" $call-nand ( ) load-base load-base /nand-block + /nand-block comp if ( ) cr ." Miscompare in block starting at page# " ( ) - " scan-page#" nandih $call-method .x cr ( ) + " scan-page#" $call-nand .x cr ( ) ?key-stop then ( ) repeat ( ) @@ -210,13 +240,13 @@ #crc-records 0 ?do (cr i . - load-base " read-next-block" nandih $call-method ( ) + load-base " read-next-block" $call-nand ( ) load-base /nand-block $crc i >crc ( actual-crc expected-crc ) 2dup <> if ( actual-crc expected-crc ) cr ." CRC miscompare - expected " . ." got " . ( ) ." in NAND block starting at page " - " scan-page#" nandih $call-method . cr + " scan-page#" $call-nand . cr ?key-stop else ( actual-crc expected-crc ) 2drop ( ) @@ -255,13 +285,13 @@ \ The stack is empty at the end of each line unless otherwise noted #nand-pages 0 do (cr i . - load-base i nand-pages/block " read-blocks" nandih $call-method + load-base i nand-pages/block " read-blocks" $call-nand nand-pages/block = if load-base /nand-block written? if load-base /nand-block " write" fileih $call-method drop dump-oob? if i nand-pages/block bounds ?do - i " read-oob" nandih $call-method h# 40 ( adr len ) + i " read-oob" $call-nand h# 40 ( adr len ) " write" fileih $call-method drop i pad ! pad 4 " write" fileih $call-method drop loop @@ -284,7 +314,7 @@ fileih 0= " Can't open NAND fastboot image file" ?nand-abort " size" fileih $call-method drop ( len ) - " start-fastcopy" nandih $call-method ( error? ) + " start-fastcopy" $call-nand ( error? ) " Not enough spare NAND space for fast copy" ?nand-abort begin ( ) @@ -293,10 +323,10 @@ \ If the read didn't fill a complete block, zero the rest load-base /nand-block rot /string erase - load-base " next-fastcopy" nandih $call-method ( ) + load-base " next-fastcopy" $call-nand ( ) repeat ( len ) drop ( ) - " end-fastcopy" nandih $call-method ( ) + " end-fastcopy" $call-nand ( ) close-nand-ihs ; Added: cpu/x86/pc/olpc/nandstat.fth =================================================================== --- cpu/x86/pc/olpc/nandstat.fth (rev 0) +++ cpu/x86/pc/olpc/nandstat.fth 2007-08-14 19:03:40 UTC (rev 535) @@ -0,0 +1,75 @@ +purpose: Graphical status display of NAND FLASH updates +\ See license at end of file + +d# 24 d# 24 2value ulhc + +d# 22 constant status-line + +8 constant glyph-w +8 constant glyph-h + +9 constant grid-w +9 constant grid-h + +d# 128 value #cols +: xy* ( x y w h -- x*w y*h ) rot * >r * r> ; + +\ States: 0:erased 1:bad 2:waiting for write 3:written + +: >loc ( eblock# -- ) #cols /mod grid-w grid-h xy* ulhc d+ ; + +: show-state ( eblock# state -- ) + swap >loc glyph-w glyph-h " fill-rectangle" $call-screen +; + +dev screen : erase-screen erase-screen ; dend + +h# 80 h# 80 h# 80 rgb>565 constant bbt-color + +: gshow-erasing ( #eblocks -- ) + cursor-off " erase-screen" $call-screen 0 status-line at-xy + ." Erasing " + + " bbt0" $call-nand nand-pages/block / bbt-color show-state + " bbt1" $call-nand nand-pages/block / bbt-color show-state + + h# ff h# ff h# ff rgb>565 ( #eblocks color ) + swap 0 ?do i over show-state loop + drop +; + +: gshow-erased ( eblock# -- ) 0 0 0 rgb>565 show-state ; + +: gshow-bad ( eblock# -- ) h# ff 0 0 rgb>565 show-state ; + +: gshow-cleaning ( -- ) ." Cleanmarkers" cr cursor-on ; +: gshow-clean ( eblock# -- ) h# 0 0 ff rgb>565 show-state ; + +: gshow-writing ( #eblocks -- ) + ." Writing " + h# ff h# ff 0 rgb>565 ( #eblocks color ) + 0 rot 0 ?do ( color eblock# ) + dup nand-pages/block * " block-bad?" $call-nand 0= if ( color eblock# ) + 2dup swap show-state + 1 + else + 0 + then + swap 1+ swap + +loop + drop +; + +: gshow-written ( eblock# -- ) 0 h# ff 0 rgb>565 show-state ; + +: gshow + ['] gshow-erasing to show-erasing + ['] gshow-erased to show-erased + ['] gshow-bad to show-bad + ['] gshow-clean to show-clean + ['] gshow-cleaning to show-cleaning + ['] gshow-writing to show-writing + ['] gshow-written to show-written +; + +gshow

1 0

r534 - ofw/inetv6
by svn＠openbios.org 14 Aug '07

14 Aug '07

Author: lwalter Date: 2007-08-14 18:05:09 +0200 (Tue, 14 Aug 2007) New Revision: 534 Modified: ofw/inetv6/arp.fth ofw/inetv6/dhcp.fth ofw/inetv6/dns.fth ofw/inetv6/dnsv6.fth ofw/inetv6/ethernet.fth ofw/inetv6/ip.fth ofw/inetv6/ipv6.fth ofw/inetv6/neighdis.fth ofw/inetv6/netload.fth Log: Use IPv4 DNS server to get IPv6 address; Use gateway when his-ip-addr is not local Modified: ofw/inetv6/arp.fth =================================================================== --- ofw/inetv6/arp.fth 2007-08-10 10:36:53 UTC (rev 533) +++ ofw/inetv6/arp.fth 2007-08-14 16:05:09 UTC (rev 534) @@ -158,7 +158,11 @@ broadcast-en-addr his-en-addr copy-en-addr ( ip-type ) else ( ip-type 'ip-adr ) his-ip-addr copy-ip-addr ( ip-type ) - his-en-addr broadcast-en-addr en= if do-arp then ( ip-type ) + his-ip-addr my-ip-addr ip-prefix=? if + his-en-addr broadcast-en-addr en= if do-arp then ( ip-type ) + else + router-en-addr his-en-addr copy-en-addr \ Not local, go through the gateway + then then his-en-addr swap exit then ( 'dest-adr type ) Modified: ofw/inetv6/dhcp.fth =================================================================== --- ofw/inetv6/dhcp.fth 2007-08-10 10:36:53 UTC (rev 533) +++ ofw/inetv6/dhcp.fth 2007-08-14 16:05:09 UTC (rev 534) @@ -249,6 +249,7 @@ 0 file-name-buf c! unknown-ip-addr name-server-ip copy-ip-addr unknown-ip-addr dhcp-server-ip copy-ip-addr + unknown-ip-addr name-server-ip-slave copy-ip-addr ; also forth definitions @@ -483,7 +484,9 @@ then then - d# 6 find-option if drop name-server-ip copy-ip-addr then + d# 6 find-option if over name-server-ip copy-ip-addr + 4 > if 4 + name-server-ip-slave copy-ip-addr else drop then + then d# 28 find-option if drop broadcast-ip-addr copy-ip-addr then d# 15 find-option if 'domain-name place-cstr drop then d# 12 find-option if 'client-name place-cstr drop then @@ -493,8 +496,11 @@ bootnet-debug if indent ." Received DHCP ACK" cr name-server-ip known? if - indent indent ." Name server: " name-server-ip .ipaddr cr + indent indent ." Master name server: " name-server-ip .ipaddr cr then + name-server-ip-slave known? if + indent indent ." Slave name server: " name-server-ip-slave .ipaddr cr + then broadcast-ip-addr if indent indent ." IP broadcast: " broadcast-ip-addr (.ipaddr) cr then Modified: ofw/inetv6/dns.fth =================================================================== --- ofw/inetv6/dns.fth 2007-08-10 10:36:53 UTC (rev 533) +++ ofw/inetv6/dns.fth 2007-08-14 16:05:09 UTC (rev 534) @@ -13,10 +13,20 @@ \ DNS question format: QNAME-variable_length, QTYPE(/w), QCLASS(/w) \ QTYPE value for "A" (host name) is 1 +\ QTYPE value for "AAAA" (IPv6 hostname) is h# 1c \ QCLASS value for "IN" (Internet) is 1 -d# 1022 value fw-port# +\ d# 1022 value fw-port# \ It's been assigned by IANA. +h# 800a constant fw-port# \ It's unassigned as of 8/13/2007. +d# 2000 constant dns-timeout + +2 value #retries-a +2 value #retries-aaaa + +0 value qtype +1 constant qclass + \ Encode/decode various DNS data types : +dnsw ( w -- ) wbsplit +xb +xb ; : -dnsw ( -- w ) -xb -xb swap bwjoin ; @@ -109,7 +119,7 @@ \ ID flags #questions #answers #namesrvrs #additional dns-xid +dnsw h# 100 +dnsw 1 +dnsw 0 +dnsw 0 +dnsw 0 +dnsw +dns-host - 1 +dnsw 1 +dnsw + qtype +dnsw qclass +dnsw x$ fw-port# dns-port# send-udp-packet r> /dns-query free-udp ; @@ -164,7 +174,7 @@ -dnsw -dnsw wljoin ( class.type ) -dnsl drop ( class.type ) \ Discard TTL - h# 1.0001 = if ( ) + qtype qclass wljoin = if ( ) -dnsw drop \ Discard RDLENGTH (it better be 4!) x$ drop true ( 'ip true ) else ( ) @@ -192,21 +202,25 @@ \ The host name can be either a simple name (e.g. "pi") or a \ fully-qualified domain name (e.g. "pi.firmworks.com"). : try-resolve ( hostname$ -- 'ip ) - name-server-ip set-dest-ip ( hostname$ ) - d# 2000 set-timeout ( hostname$ ) - send-dns-query ( ) - dns-xid dns-port# fw-port# receive-dns-reply ( error? ) - 1 and throw ( ) - get-host-addr ( answer-ip ) + dns-timeout set-timeout ( hostname$ ) + send-dns-query ( ) + dns-xid dns-port# fw-port# receive-dns-reply ( error? ) + 1 and throw ( ) + get-host-addr ( answer-ip ) ; -: (resolve) ( hostname$ -- ) - bootnet-debug if ( hostname$ ) - ." Using DNS to find the IP address of " ( hostname$ ) - 2dup type cr ( hostname$ ) - then ( hostname$ ) +: resolve-a ( hostname$ -- 'ip ) + bootnet-debug if ( hostname$ ) + ." Using DNS to find the IP address of " ( hostname$ ) + 2dup type cr ( hostname$ ) + then ( hostname$ ) - d# 20 0 do \ Try 20 times at 2 seconds per try - 2dup ['] try-resolve catch ?dup if ( hostname$ x x err ) + 1 to qtype + #retries-a 0 do \ Try 20 times at 2 seconds per try + name-server-ip set-dest-ip + i 1 and if + name-server-ip-slave known? if name-server-ip-slave set-dest-ip then + then + 2dup ['] try-resolve catch ?dup if ( hostname$ x x err ) nip nip ( hostname$ err ) 1 <> if ( hostname$ ) bootnet-debug if ( hostname$ ) @@ -214,21 +228,66 @@ then ( hostname$ ) true abort" Unknown hostname" then ( hostname$ ) - else ( hostname$ 'ip ) - bootnet-debug if ( hostname$ 'ip ) - ." Got IP address " dup .ipaddr cr ( hostname$ 'ip ) - then ( hostname$ 'ip ) + else ( hostname$ 'ip ) + bootnet-debug if ( hostname$ 'ip ) + indent ." Got IP address " dup .ipaddr cr ( hostname$ 'ip ) + then ( hostname$ 'ip ) - nip nip ( 'ip ) + nip nip ( 'ip ) unloop exit - then ( hostname$ ) - loop ( hostname$ ) + then ( hostname$ ) + loop ( hostname$ ) - bootnet-debug if ." No answer to DNS request" cr then ( hostname$ ) + bootnet-debug if ." No answer to DNS A request" cr then ( hostname$ ) true abort" DNS: No answer" ; -\ : resolve ( 'ip hostname$ -- ) (resolve) swap copy-ip-addr ; +[ifdef] include-ipv6 +: resolve-aaaa ( hostname$ -- ) + bootnet-debug if ( hostname$ ) + ." Using DNS AAAA to find the IPv6 address of " ( hostname$ ) + 2dup type cr ( hostname$ ) + then + + h# 1c to qtype + #retries-aaaa 0 do \ Try 20 times at 2 seconds per try + name-server-ip set-dest-ip + i 1 and if + name-server-ip-slave known? if name-server-ip-slave set-dest-ip then + then + 2dup ['] try-resolve catch ?dup if ( hostname$ x x err ) + nip nip ( hostname$ err ) + 1 <> if ( hostname$ ) + bootnet-debug if ( hostname$ ) + indent ." Unknown IPv6 hostname: " 2dup type cr ( hostname ) + then ( hostname$ ) + true abort" Unknown IPv6 hostname" + then ( hostname$ ) + else ( hostname$ 'ip ) + bootnet-debug if ( hostname$ 'ip ) + indent ." Got IPv6 address " dup .ipv6 cr ( hostname$ 'ip ) + then ( hostname$ 'ip ) + + set-dest-ipv6 2drop ( ) + unloop exit + then ( hostname$ ) + loop ( hostname$ ) + + bootnet-debug if indent ." No answer to DNS AAAA request" cr then ( hostname$ ) + true abort" DNS AAAA: No answer" +; +[else] +: resolve-aaaa ( hostname$ -- ) abort" IPv4 AAAA DNS not supported" ; +[then] + +false value resolve-flag +: resolvev4 ( hostname$ -- ) + false to resolve-flag + 2dup ['] resolve-a catch if 2drop else true to resolve-flag set-dest-ip then + ['] resolve-aaaa catch if 2drop else true to resolve-flag then + resolve-flag not abort" DNS: No answer" +; + headerless : ?bad-ip ( flag -- ) abort" Bad host name or address" ; 4 buffer: ip-buf @@ -245,8 +304,7 @@ headers : $set-host ( hostname$ -- ) dup 0= ?bad-ip - over c@ [char] 0 [char] 9 between if $>ip else (resolve) then - set-dest-ip + over c@ [char] 0 [char] 9 between if $>ip set-dest-ip else resolvev4 then ; \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks Modified: ofw/inetv6/dnsv6.fth =================================================================== --- ofw/inetv6/dnsv6.fth 2007-08-10 10:36:53 UTC (rev 533) +++ ofw/inetv6/dnsv6.fth 2007-08-14 16:05:09 UTC (rev 534) @@ -7,26 +7,46 @@ [ifndef] include-ipv4 : $>ip ( hostname$ -- 'ip ) .ipv4-not-supported ; -: (resolve) ( hostname$ -- 'ip ) .ipv4-not-supported ; +: resolvev4 ( hostname$ -- ) .ipv4-not-supported ; : set-dest-ip ( buf -- ) .ipv4-not-supported ; : ?bad-ip ( flag -- ) abort" Bad host name or address" ; [then] +: resolvev6 ( hostname$ -- ) + true to use-ipv6? + unknown-ipv6-addr his-ipv6-addr copy-ipv6-addr + abort" IPv6 DNS not supported yet" +; + headers -: (resolvev6) ( hostname$ -- 'ip ) ; \ XXX Try (resolve) or (resolve6) first. If fail, try the other one. -: (resolve) ( hostname$ -- 'ip ) - use-ipv6? if (resolvev6) true else (resolve) false then - dup to use-ipv6? - if set-dest-ipv6 else set-dest-ip then +: (resolve) ( hostname$ -- ) + 2dup ['] resolvev6 catch if + 2drop + false to use-ipv6? + resolvev4 + else + 2drop + then + use-ipv6-ok? dup to use-ipv6? if \ Make sure all the addresses are set properly + his-ipv6-addr (set-dest-ipv6) + bootnet-debug if ." Use IPv6 protocol" cr then + else + his-ip-addr (set-dest-ip) + bootnet-debug if ." Use IP protocol" cr then + then ; : $set-host ( hostname$ -- ) dup 0= ?bad-ip 2dup ['] $>ip catch if 2drop else false to use-ipv6? set-dest-ip 2drop exit then - 2dup ipv6-buf ['] $ipv6# catch nip nip not if true to use-ipv6? ipv6-buf set-dest-ipv6 exit then - (resolve) + 2dup ipv6-buf ['] $ipv6# catch if + 3drop (resolve) + else + 2drop + true to use-ipv6? ipv6-buf set-dest-ipv6 + then ; \ LICENSE_BEGIN Modified: ofw/inetv6/ethernet.fth =================================================================== --- ofw/inetv6/ethernet.fth 2007-08-10 10:36:53 UTC (rev 533) +++ ofw/inetv6/ethernet.fth 2007-08-14 16:05:09 UTC (rev 534) @@ -39,11 +39,13 @@ /e buffer: my-en-addr /e buffer: his-en-addr -/e buffer: routerv6-en-addr +/e buffer: router-en-addr \ IPv4 gateway/router +/e buffer: routerv6-en-addr \ IPv6 router /e buffer: mc-en-addr -: .my-link-addr ( -- ) ." My MAC: " my-en-addr .enaddr ; -: .his-link-addr ( -- ) ." His MAC: " his-en-addr .enaddr ; +: .my-link-addr ( -- ) ." My MAC: " my-en-addr .enaddr ; +: .his-link-addr ( -- ) ." His MAC: " his-en-addr .enaddr ; +: .router-en-addr ( -- ) ." Gateway MAC: " router-en-addr .enaddr ; : .routerv6-en-addr ( -- ) ." IPv6 router MAC: " routerv6-en-addr .enaddr ; create mc-en-addr-all-nodes h# 33 c, h# 33 c, h# 00 c, 0 c, 0 c, 1 c, Modified: ofw/inetv6/ip.fth =================================================================== --- ofw/inetv6/ip.fth 2007-08-10 10:36:53 UTC (rev 533) +++ ofw/inetv6/ip.fth 2007-08-14 16:05:09 UTC (rev 534) @@ -42,6 +42,7 @@ headers /i buffer: his-ip-addr /i buffer: name-server-ip +/i buffer: name-server-ip-slave ' 'domain-name " domain-name" chosen-string headerless @@ -125,13 +126,12 @@ 0 instance value last-ip-packet headers +: (set-dest-ip) ( buf -- ) + his-ip-addr copy-ip-addr + unlock-link-addr +; : set-dest-ip ( buf -- ) - dup his-ip-addr ip= if - drop - else - his-ip-addr copy-ip-addr - unlock-link-addr - then + dup his-ip-addr ip= if drop else (set-dest-ip) then ; : lock-ip-address ( -- ) Modified: ofw/inetv6/ipv6.fth =================================================================== --- ofw/inetv6/ipv6.fth 2007-08-10 10:36:53 UTC (rev 533) +++ ofw/inetv6/ipv6.fth 2007-08-14 16:05:09 UTC (rev 534) @@ -135,6 +135,10 @@ : ipv6-addr-local? ( adr-buf -- flag ) c@ h# e0 and h# 20 <> ; : use-routerv6? ( -- flag ) routerv6-en-addr unknown-en-addr? not ; +: use-ipv6-ok? ( -- flag ) + his-ipv6-addr knownv6? + his-ipv6-addr ipv6-addr-local? not if use-routerv6? and then +; /ipv6 buffer: server-ipv6-addr : use-serverv6? ( -- flag ) server-ipv6-addr knownv6? ; @@ -174,22 +178,21 @@ [then] headers -: set-dest-ipv6 ( buf -- ) - dup his-ipv6-addr ipv6= if - drop +: (set-dest-ipv6) ( buf -- ) + his-ipv6-addr copy-ipv6-addr + set-his-ipv6-addr-mc + his-ipv6-addr ipv6-addr-local? if + unlock-link-addr + my-ipv6-addr-link-local else - his-ipv6-addr copy-ipv6-addr - set-his-ipv6-addr-mc - his-ipv6-addr ipv6-addr-local? if - unlock-link-addr - my-ipv6-addr-link-local - else - use-routerv6? if routerv6-en-addr his-en-addr copy-en-addr then - my-ipv6-addr-global - then - my-ipv6-addr copy-ipv6-addr + use-routerv6? if routerv6-en-addr his-en-addr copy-en-addr then + my-ipv6-addr-global then + my-ipv6-addr copy-ipv6-addr ; +: set-dest-ipv6 ( buf -- ) + dup his-ipv6-addr ipv6= if drop else (set-dest-ipv6) then +; : lock-ipv6-address ( -- ) the-struct >r last-ip-packet set-struct Modified: ofw/inetv6/neighdis.fth =================================================================== --- ofw/inetv6/neighdis.fth 2007-08-10 10:36:53 UTC (rev 533) +++ ofw/inetv6/neighdis.fth 2007-08-14 16:05:09 UTC (rev 534) @@ -27,8 +27,8 @@ /ipv6 buffer: his-ipv6-addr-temp : do-neighbor-discovery ( -- ) bootnet-debug if - ." ICMPv6 ND protocol: Getting MAC address for IP address: " - his-ipv6-addr .ipv6 cr + ." ICMPv6 ND protocol: Getting MAC address for IPv6 address: " cr + indent his-ipv6-addr .ipv6 cr then his-ipv6-addr his-ipv6-addr-temp copy-ipv6-addr @@ -56,7 +56,11 @@ broadcast-en-addr his-en-addr copy-en-addr ( ip-type ) else ( ip-type 'ip-adr ) his-ip-addr copy-ip-addr ( ip-type ) - his-en-addr broadcast-en-addr en= if do-arp then ( ip-type ) + his-ip-addr my-ip-addr ip-prefix=? if + his-en-addr broadcast-en-addr en= if do-arp then ( ip-type ) + else + router-en-addr his-en-addr copy-en-addr + then then his-en-addr swap [then] @@ -76,7 +80,7 @@ bootnet-debug if ." My IPv6 configuration (stateless autoconfiguration): " cr indent .my-ipv6-addr-link-local cr - my-ipv6-addr-global unknown-ipv6-addr? not if + my-ipv6-addr-global knownv6? if indent .my-ipv6-addr-global cr indent .my-prefix cr then Modified: ofw/inetv6/netload.fth =================================================================== --- ofw/inetv6/netload.fth 2007-08-10 10:36:53 UTC (rev 533) +++ ofw/inetv6/netload.fth 2007-08-14 16:05:09 UTC (rev 534) @@ -26,7 +26,9 @@ ; : show-router-addr ( -- ) - bootnet-debug if ." Router IP: = " router-ip-addr .ipaddr cr then + bootnet-debug if + .router-en-addr ." Router IP: = " router-ip-addr .ipaddr cr + then ; : show-all-en-ip-address ( -- ) @@ -102,6 +104,7 @@ indent ." Boot server: " server-ip-addr .ipaddr cr then use-router? if + indent .router-en-addr cr indent ." Router: " router-ip-addr .ipaddr cr then then @@ -400,6 +403,12 @@ 2drop false ; +: resolve-router-en-addr ( -- ) + router-ip-addr his-ip-addr copy-ip-addr + do-arp + his-en-addr router-en-addr copy-en-addr +; + defer configured ' noop to configured : configure ( -- ) use-last? if configured exit then @@ -430,6 +439,7 @@ server-ip-addr set-dest-ip then then + use-router? if resolve-router-en-addr then \ Find router's MAC address show-all-en-ip-address configured ;

1 0

r169 - openbios-devel/arch/sparc32
by svn＠openbios.org 11 Aug '07

11 Aug '07

Author: blueswirl Date: 2007-08-11 09:45:33 +0200 (Sat, 11 Aug 2007) New Revision: 169 Modified: openbios-devel/arch/sparc32/romvec.c Log: Fix NetBSD property problems Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2007-08-05 18:01:20 UTC (rev 168) +++ openbios-devel/arch/sparc32/romvec.c 2007-08-11 07:45:33 UTC (rev 169) @@ -86,6 +86,11 @@ { int notfound; + if (!node) { + DPRINTF("obp_proplen(0x0, %s) = -1\n", name); + return -1; + } + push_str(name); PUSH(node); fword("get-package-property"); @@ -127,6 +132,11 @@ int len; char *str; + if (!node) { + DPRINTF("obp_getprop(0x0, %s) = -1\n", name); + return -1; + } + if (!name) { // NULL name means get first property push_str("");

1 0

r533 - cpu/x86/pc/olpc
by svn＠openbios.org 10 Aug '07

10 Aug '07

Author: rsmith Date: 2007-08-10 12:36:53 +0200 (Fri, 10 Aug 2007) New Revision: 533 Modified: cpu/x86/pc/olpc/versions.fth Log: OLPC: Ver q2c23 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-08-10 02:06:46 UTC (rev 532) +++ cpu/x86/pc/olpc/versions.fth 2007-08-10 10:36:53 UTC (rev 533) @@ -2,10 +2,10 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 22 +macro: FW_MINOR 23 \ The EC microcode -macro: EC_VERSION c20 +macro: EC_VERSION c23 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

r532 - ofw/inetv6
by svn＠openbios.org 10 Aug '07

10 Aug '07

Author: lwalter Date: 2007-08-10 04:06:46 +0200 (Fri, 10 Aug 2007) New Revision: 532 Modified: ofw/inetv6/ethernet.fth Log: Send multiple multicast addresses to set-multicast Modified: ofw/inetv6/ethernet.fth =================================================================== --- ofw/inetv6/ethernet.fth 2007-08-09 21:42:49 UTC (rev 531) +++ ofw/inetv6/ethernet.fth 2007-08-10 02:06:46 UTC (rev 532) @@ -66,9 +66,13 @@ ; : set-mc-hash ( -- err? ) - \ XXX Make buffer of all multicast addresses for "set-multicast" my-en-addr 3 + multicast-en-addr 3 + 3 move - multicast-en-addr /e " set-multicast" ['] $call-parent catch 0= if false exit then + /e 2 * dup >r alloc-mem >r ( R: len adr ) + multicast-en-addr r@ /e move ( R: len adr ) + mc-en-addr-all-nodes r@ /e + /e move ( R: len adr ) + 2r@ swap " set-multicast" ['] $call-parent catch ( flag ) ( R: len adr ) + 2r> swap free-mem ( flag ) + 0= if false exit then 4drop multicast-en-addr (set-mc-hash) mc-en-addr-all-nodes (set-mc-hash) or

1 0

r531 - ofw/inetv6
by svn＠openbios.org 09 Aug '07

09 Aug '07

Author: lwalter Date: 2007-08-09 23:42:49 +0200 (Thu, 09 Aug 2007) New Revision: 531 Modified: ofw/inetv6/attr-ipv6.fth ofw/inetv6/ethernet.fth ofw/inetv6/icmpinfo.fth ofw/inetv6/icmpv6.fth ofw/inetv6/ipfrv6.fth ofw/inetv6/ippkg.fth ofw/inetv6/ipv6.fth ofw/inetv6/neighdis.fth ofw/inetv6/supportv6.fth ofw/inetv6/tcpv6.fth Log: DAD, Router Discovery, route global IPv6 packets via router discovered Modified: ofw/inetv6/attr-ipv6.fth =================================================================== --- ofw/inetv6/attr-ipv6.fth 2007-08-08 03:14:05 UTC (rev 530) +++ ofw/inetv6/attr-ipv6.fth 2007-08-09 21:42:49 UTC (rev 531) @@ -23,10 +23,11 @@ : (setup-ipv6-attr) ( -- ) \ set tftp ip addresses (setup-ip-attr) - my-ipv6-addr /ipv6 " client-ipv6" set-chosen-property - his-ipv6-addr /ipv6 " server-ipv6" set-chosen-property - router-ipv6-addr /ipv6 " gateway-ipv6" set-chosen-property - my-mc-ipv6-addr /ipv6 " multicast-ipv6" set-chosen-property + my-prefix /ipv6 " ipv6-prefix" set-chosen-property + my-ipv6-addr-link-local /ipv6 " client-ipv6-local" set-chosen-property + my-ipv6-addr-global /ipv6 " client-ipv6-global" set-chosen-property + his-ipv6-addr /ipv6 " server-ipv6" set-chosen-property + router-ipv6-addr /ipv6 " gateway-ipv6" set-chosen-property ; ['] (setup-ipv6-attr) is setup-ip-attr Modified: ofw/inetv6/ethernet.fth =================================================================== --- ofw/inetv6/ethernet.fth 2007-08-08 03:14:05 UTC (rev 530) +++ ofw/inetv6/ethernet.fth 2007-08-09 21:42:49 UTC (rev 531) @@ -39,13 +39,19 @@ /e buffer: my-en-addr /e buffer: his-en-addr +/e buffer: routerv6-en-addr +/e buffer: mc-en-addr : .my-link-addr ( -- ) ." My MAC: " my-en-addr .enaddr ; : .his-link-addr ( -- ) ." His MAC: " his-en-addr .enaddr ; +: .routerv6-en-addr ( -- ) ." IPv6 router MAC: " routerv6-en-addr .enaddr ; -create multicast-en-addr h# 33 c, 33 c, h# ff c, 0 c, 0 c, 0 c, -create broadcast-en-addr h# ff c, ff c, h# ff c, h# ff c, h# ff c, h# ff c, +create mc-en-addr-all-nodes h# 33 c, h# 33 c, h# 00 c, 0 c, 0 c, 1 c, +create multicast-en-addr h# 33 c, h# 33 c, h# ff c, 0 c, 0 c, 0 c, +create broadcast-en-addr h# ff c, h# ff c, h# ff c, h# ff c, h# ff c, h# ff c, +: unknown-en-addr? ( 'en -- flag ) dup l@ 0= swap w@ 0= and ; + decimal struct ( ether-header ) @@ -54,14 +60,22 @@ 2 sfield en-type constant /ether-header +: (set-mc-hash) ( 'mc-en-adr -- err? ) + /e " $crc" evaluate invert + " set-hash" ['] $call-parent catch if 3drop true else false then +; + : set-mc-hash ( -- err? ) - my-ipv6-addr /ipv6 + 3 - multicast-en-addr 3 + 3 move + \ XXX Make buffer of all multicast addresses for "set-multicast" + my-en-addr 3 + multicast-en-addr 3 + 3 move multicast-en-addr /e " set-multicast" ['] $call-parent catch 0= if false exit then 4drop - multicast-en-addr /e " $crc" evaluate invert - " set-hash" ['] $call-parent catch if 3drop true else false then + multicast-en-addr (set-mc-hash) + mc-en-addr-all-nodes (set-mc-hash) or ; +: multicast-en-addr? ( adr -- flag ) w@ h# 3333 = ; + : select-ethernet-header ( -- ) packet-buffer set-struct ; : max-link-payload ( -- n ) link-mtu /ether-header - ; Modified: ofw/inetv6/icmpinfo.fth =================================================================== --- ofw/inetv6/icmpinfo.fth 2007-08-08 03:14:05 UTC (rev 530) +++ ofw/inetv6/icmpinfo.fth 2007-08-09 21:42:49 UTC (rev 531) @@ -11,32 +11,46 @@ : handle-router-sol ( adr len -- ) 2drop ; \ Router solicitation : handle-router-ad ( adr len -- ) 2drop ; \ Router advertisement +: send-router-sol ( -- ) + 8 allocate-icmpv6 set-struct \ Option: source link-layer addr + d# 133 icmp-type xc! + 0 icmp-code xc! + 0 icmp-flags xl! + h# 101 icmp-data xw! \ Option type 1 (source mac addr) + my-en-addr icmp-data 2 + copy-en-addr + + hop-limit >r h# ff to hop-limit + the-struct 8 2dup send-icmpv6-packet + free-icmpv6 + r> to hop-limit +; + : handle-mc-router-ad ( adr len -- ) 2drop ; \ Multicast router advertisement : handle-mc-router-sol ( adr len -- ) 2drop ; \ Multicast router solicitation : handle-mc-router-term ( adr len -- ) 2drop ; \ Multicast router termination -: send-neigh-sol ( -- ) +: send-neigh-sol ( 'ipv6 -- ) d# 24 allocate-icmpv6 set-struct \ Dest IPv6 + one option d# 135 icmp-type xc! 0 icmp-code xc! 0 icmp-flags xl! - his-ipv6-addr icmp-data copy-ipv6-addr + ( 'ipv6 ) icmp-data copy-ipv6-addr h# 101 icmp-data /ipv6 + xw! \ Option type 1 (source mac addr) \ Length (in 8 octels) - my-en-addr icmp-data /ipv6 + 2 + copy-ipv6-addr + my-en-addr icmp-data /ipv6 + 2 + copy-en-addr hop-limit >r h# ff to hop-limit \ Save and change hop-limit - the-struct d# 24 2dup send-mc-icmpv6-packet + the-struct d# 24 2dup send-icmpv6-packet free-icmpv6 r> to hop-limit \ Restore hop-limit ; -: send-neigh-ad ( solicited? -- ) +: send-neigh-ad ( 'ip solicited? -- ) d# 24 allocate-icmpv6 set-struct \ Dest IPv6 + one option d# 136 icmp-type xc! 0 icmp-code xc! h# 40 and h# 20 or icmp-flags xl! \ Flags = (un)solicited, override - my-ipv6-addr icmp-data copy-ipv6-addr + ( 'ip ) icmp-data copy-ipv6-addr h# 201 icmp-data /ipv6 + xw! \ Option type 2 (target mac addr) \ Length (in 8 octels) my-en-addr icmp-data /ipv6 + 2 + copy-ipv6-addr @@ -47,16 +61,31 @@ r> to hop-limit \ Restore hop-limit ; +/ipv6 buffer: his-ipv6-addr-save +/ipv6 buffer: my-ipv6-addr-save : handle-neigh-sol ( adr len -- ) \ Neighbor solicitation \ XXX Verify hop limit is 255. dup d# 24 < if 2drop exit then bootnet-debug if ." Neighbor solicitation from MAC: " over d# 26 + .enaddr cr then - over /icmp-header + my-ipv6-addr ipv6= not if ." Not for me" cr 2drop exit then - 2drop + over /icmp-header + my-ipv6-addr ipv6= not if + bootnet-debug if ." Not for me" cr then + 2drop exit + then + \ XXX Send Neighbor Advertisement - true send-neigh-ad + drop ( adr ) + his-ipv6-addr his-ipv6-addr-save copy-ipv6-addr \ Save his-ipv6-addr + my-ipv6-addr my-ipv6-addr-save copy-ipv6-addr + ipv6-dest-addr c@ dup h# ff = swap h# fe = or if + my-ipv6-addr-link-local else my-ipv6-addr-global + then + my-ipv6-addr copy-ipv6-addr + ipv6-source-addr his-ipv6-addr copy-ipv6-addr \ Use the solicitor's IPv6 addr as dst + /icmp-header + true send-neigh-ad + his-ipv6-addr-save his-ipv6-addr copy-ipv6-addr \ Restore his-ipv6-addr + my-ipv6-addr-save my-ipv6-addr copy-ipv6-addr ; : handle-neigh-ad ( adr len -- ) 2drop ; \ Neighbor advertisement Modified: ofw/inetv6/icmpv6.fth =================================================================== --- ofw/inetv6/icmpv6.fth 2007-08-08 03:14:05 UTC (rev 530) +++ ofw/inetv6/icmpv6.fth 2007-08-09 21:42:49 UTC (rev 531) @@ -50,7 +50,7 @@ /ipv6 buffer: his-ipv6-temp : send-mc-icmpv6-packet ( adr len -- ) \ Send to his multicast IPv6 address his-ipv6-addr his-ipv6-temp copy-ipv6-addr - his-mc-ipv6-addr his-ipv6-addr copy-ipv6-addr + his-ipv6-addr-mc-sol-node his-ipv6-addr copy-ipv6-addr send-icmpv6-packet his-ipv6-temp his-ipv6-addr copy-ipv6-addr ; Modified: ofw/inetv6/ipfrv6.fth =================================================================== --- ofw/inetv6/ipfrv6.fth 2007-08-08 03:14:05 UTC (rev 530) +++ ofw/inetv6/ipfrv6.fth 2007-08-09 21:42:49 UTC (rev 531) @@ -3,32 +3,6 @@ headerless -d# 0 constant IP_HDR_HOP \ Hop-by-hop option -d# 1 constant IP_HDR_ICMPV4 \ Internet control message protocol - IPv4 -d# 2 constant IP_HDR_IGMPV4 \ Internet group management protocol - IPv4 -d# 4 constant IP_HDR_IPV4 -d# 6 constant IP_HDR_TCP -d# 8 constant IP_HDR_EGP \ Exterior gateway protocol -d# 9 constant IP_HDR_IGP \ Cisco private interior gateway -d# 17 constant IP_HDR_UDP -d# 41 constant IP_HDR_IPV6 -d# 43 constant IP_HDR_ROUTING \ Routing header -d# 44 constant IP_HDR_FRAGMENT -d# 45 constant IP_HDR_IDRP \ Interdomain routing protocol -d# 46 constant IP_HDR_RSVP \ Resource reservation protocol -d# 47 constant IP_HDR_GRE \ General routing encapsulation -d# 50 constant IP_HDR_SECURE \ Encrypted security payload -d# 51 constant IP_HDR_AUTHEN \ Authentication -d# 58 constant IP_HDR_ICMPV6 -d# 59 constant IP_HDR_NONE \ No next header -d# 60 constant IP_HDR_DEST \ Destination options -d# 88 constant IP_HDR_EIGRP -d# 89 constant IP_HDR_OSPF -d# 108 constant IP_HDR_COMP \ IP payload compression protocol -d# 115 constant IP_HDR_L2TP \ Layer 2 tunneling protocol -d# 132 constant IP_HDR_SCTP \ Stream control transmission protocol -d# 135 constant IP_HDR_MOBILITY \ Mobile IPV6 - struct ( ipv6-frag-header ) 1 sfield ipv6-fh-next-hdr 1 sfield ipv6-fh-len @@ -48,7 +22,7 @@ constant /ipv6-frag-hdr instance variable frag-id -0 instance value hop-limit +h# 40 instance value hop-limit headers @@ -75,7 +49,8 @@ h# 6000.0000 ipv6-version xl! \ version 6 ( protocol ) ipv6-next-hdr xc! ( len ) ( len ) dup ipv6-length xw! ( len ) - hop-limit ipv6-hop-limit xc! ( len ) + his-ipv6-addr ipv6-addr-local? if hop-limit else router-hop-limit then + ( hop-limit ) ipv6-hop-limit xc! ( len ) my-ipv6-addr ipv6-source-addr copy-ipv6-addr ( len ) his-ipv6-addr ipv6-dest-addr copy-ipv6-addr ( len ) /ipv6-header + ( ip-len ) Modified: ofw/inetv6/ippkg.fth =================================================================== --- ofw/inetv6/ippkg.fth 2007-08-08 03:14:05 UTC (rev 530) +++ ofw/inetv6/ippkg.fth 2007-08-09 21:42:49 UTC (rev 531) @@ -72,7 +72,7 @@ call-tftp: set-dest-ipv6 ( 'ip -- ) call-tftp: max-ipv6-payload ( -- n ) call-tftp: prefix-match? ( 'ip1 'ip2 -- flag ) -call-tftp: his-mc-ipv6-addr? ( 'ip -- flag ) +call-tftp: his-ipv6-addr-mc? ( 'ip -- flag ) [then] call-tftp: set-timeout ( #milliseconds -- ) Modified: ofw/inetv6/ipv6.fth =================================================================== --- ofw/inetv6/ipv6.fth 2007-08-08 03:14:05 UTC (rev 530) +++ ofw/inetv6/ipv6.fth 2007-08-09 21:42:49 UTC (rev 531) @@ -4,6 +4,14 @@ \ Internet protocol version 6 (IPv6). +\ IPv6 refixes: +\ ::0/8 unaligned +\ 2000::/3 global unicast +\ fe80::/10 link-local unicast +\ fc00::/7 site-local IPv6 address +\ fd00::/8 private administration +\ ff00::/8 multicast + decimal headerless @@ -26,24 +34,60 @@ \ There maybe extension headers here. constant /ipv6-header +\ Values of ipv6-next-hdr +d# 0 constant IP_HDR_HOP \ Hop-by-hop option +d# 1 constant IP_HDR_ICMPV4 \ Internet control message protocol - IPv4 +d# 2 constant IP_HDR_IGMPV4 \ Internet group management protocol - IPv4 +d# 4 constant IP_HDR_IPV4 +d# 6 constant IP_HDR_TCP +d# 8 constant IP_HDR_EGP \ Exterior gateway protocol +d# 9 constant IP_HDR_IGP \ Cisco private interior gateway +d# 17 constant IP_HDR_UDP +d# 41 constant IP_HDR_IPV6 +d# 43 constant IP_HDR_ROUTING \ Routing header +d# 44 constant IP_HDR_FRAGMENT +d# 45 constant IP_HDR_IDRP \ Interdomain routing protocol +d# 46 constant IP_HDR_RSVP \ Resource reservation protocol +d# 47 constant IP_HDR_GRE \ General routing encapsulation +d# 50 constant IP_HDR_SECURE \ Encrypted security payload +d# 51 constant IP_HDR_AUTHEN \ Authentication +d# 58 constant IP_HDR_ICMPV6 +d# 59 constant IP_HDR_NONE \ No next header +d# 60 constant IP_HDR_DEST \ Destination options +d# 88 constant IP_HDR_EIGRP +d# 89 constant IP_HDR_OSPF +d# 108 constant IP_HDR_COMP \ IP payload compression protocol +d# 115 constant IP_HDR_L2TP \ Layer 2 tunneling protocol +d# 132 constant IP_HDR_SCTP \ Stream control transmission protocol +d# 135 constant IP_HDR_MOBILITY \ Mobile IPV6 + [ifndef] include-ipv4 d# 256 buffer: 'domain-name ' 'domain-name " domain-name" chosen-string : use-server? ( -- flag ) false ; -: use-router? ( -- flag ) false ; [then] headers -0 instance value prefix +0 value /prefix \ Length of prefix (# of bits) +0 value prefix-flag +0 value prefix-lifetime +/ipv6 buffer: my-prefix + /ipv6 buffer: his-ipv6-addr +/ipv6 buffer: my-ipv6-addr-link-local +/ipv6 buffer: my-ipv6-addr-global +/ipv6 buffer: router-ipv6-addr /ipv6 buffer: name-server-ipv6 headerless \ link-local scope multicast all-nodes address -create my-mc-ipv6-addr h# ff c, 2 c, 0 w, 0 l, 0 w, 0 c, 1 c, h# ff c, 0 c, 0 c, 0 c, -create his-mc-ipv6-addr h# ff c, 2 c, 0 w, 0 l, 0 w, 0 c, 1 c, h# ff c, 0 c, 0 c, 0 c, -create unknown-ipv6-addr h# 00 l, h# 00 l, h# 00 l, h# 00 l, +create unknown-ipv6-addr 0 l, 0 l, 0 l, 0 l, +create default-ipv6-addr h# fe c, h# 80 c, 0 w, 0 l, 0 w, 0 c, h# ff c, h# fe c, 0 c, 0 w, +create ipv6-addr-mc-all-nodes h# ff c, 2 c, 0 w, 0 l, 0 l, 0 w, 0 c, 1 c, +create ipv6-addr-mc-all-routers h# ff c, 2 c, 0 w, 0 l, 0 l, 0 w, 0 c, 2 c, +create my-ipv6-addr-mc-sol-node h# ff c, 2 c, 0 w, 0 l, 0 w, 0 c, 1 c, h# ff c, 0 c, 0 w, +create his-ipv6-addr-mc-sol-node h# ff c, 2 c, 0 w, 0 l, 0 w, 0 c, 1 c, h# ff c, 0 c, 0 w, : ipv6= ( ip-addr1 ip-addr2 -- flag ) /ipv6 comp 0= ; @@ -59,7 +103,7 @@ ; : prefix-match? ( ip1 ip2 -- flag ) - prefix 8 /mod 2over 2 pick ( ip1 ip2 rem quot ip1 ip2 quot ) + /prefix 8 /mod 2over 2 pick ( ip1 ip2 rem quot ip1 ip2 quot ) comp 0= if swap bits>mask >r ( ip1 ip2 quot ) ( R: mask ) tuck + c@ r@ and ( ip1 quot [ip2+quot]&mask ) ( R: mask ) @@ -69,26 +113,29 @@ then ; -: set-his-mc-ipv6-addr ( -- ) - his-ipv6-addr /ipv6 + 3 - his-mc-ipv6-addr /ipv6 + 3 - 3 move +: set-his-ipv6-addr-mc ( -- ) + his-ipv6-addr /ipv6 + 3 - his-ipv6-addr-mc-sol-node /ipv6 + 3 - 3 move ; -: set-my-mc-ipv6-addr ( -- ) - my-ipv6-addr /ipv6 + 3 - my-mc-ipv6-addr /ipv6 + 3 - 3 move +: set-my-ipv6-addr-mc ( -- ) + my-ipv6-addr-link-local /ipv6 + 3 - my-ipv6-addr-mc-sol-node /ipv6 + 3 - 3 move ; -: his-mc-ipv6-addr? ( adr-buf -- flag ) - dup his-mc-ipv6-addr ipv6= swap unknown-ipv6-addr? or +: his-ipv6-addr-mc? ( adr-buf -- flag ) + >r + r@ his-ipv6-addr-mc-sol-node ipv6= \ His solicited node address? + r@ ipv6-addr-mc-all-nodes ipv6= or \ Multicast all-nodes? + r> ipv6-addr-mc-all-routers ipv6= or \ Multicast all-routers? ; -: my-mc-ipv6-addr? ( adr-buf -- flag ) - dup my-mc-ipv6-addr ipv6= swap unknown-ipv6-addr? or +: my-ipv6-addr-mc? ( adr-buf -- flag ) + >r + r@ my-ipv6-addr-mc-sol-node ipv6= \ My solicited node address? + r> ipv6-addr-mc-all-nodes ipv6= or \ Multicast all-nodes? ; -/ipv6 buffer: router-ipv6-addr -: use-routerv6? ( -- flag ) router-ipv6-addr knownv6? ; -: use-router? ( -- flag ) - use-ipv6? if use-routerv6? else use-router? then -; +: ipv6-addr-local? ( adr-buf -- flag ) c@ h# e0 and h# 20 <> ; +: use-routerv6? ( -- flag ) routerv6-en-addr unknown-en-addr? not ; + /ipv6 buffer: server-ipv6-addr : use-serverv6? ( -- flag ) server-ipv6-addr knownv6? ; : use-server? ( -- flag ) @@ -96,10 +143,12 @@ ; \ Generate his multicast MAC address from his IPv6 address -: set-his-mc-en ( -- ) - his-ipv6-addr be-w@ h# fe80 = - his-ipv6-addr d# 11 + be-w@ h# fffe = and if - multicast-en-addr his-en-addr 3 move +: set-his-en-addr-mc ( -- ) + multicast-en-addr his-en-addr 2 move + his-ipv6-addr c@ h# ff = if + his-ipv6-addr d# 12 + his-en-addr 2 + 4 move + else + h# ff his-en-addr 2 + c! his-ipv6-addr d# 13 + his-en-addr 3 + 3 move then ; @@ -109,8 +158,16 @@ : indent ( -- ) bootnet-debug if ." " then ; [then] headerless -: .my-ipv6-addr ( -- ) ." My IP: " my-ipv6-addr .ipv6 ; -: .his-ipv6-addr ( -- ) ." His IP: " his-ipv6-addr .ipv6 ; +: .my-ipv6-addr-link-local ( -- ) + ." My IPv6 (local link): " my-ipv6-addr-link-local .ipv6 +; +: .my-ipv6-addr-global ( -- ) + ." My IPv6 (global): " my-ipv6-addr-global .ipv6 +; +: .his-ipv6-addr ( -- ) ." His IP: " his-ipv6-addr .ipv6 ; +: .my-prefix ( -- ) + ." My prefix (global): " my-prefix .ipv6 ." /" /prefix .d +; [ifndef] include-ipv4 0 instance value last-ip-packet @@ -122,8 +179,15 @@ drop else his-ipv6-addr copy-ipv6-addr - set-his-mc-ipv6-addr - unlock-link-addr + set-his-ipv6-addr-mc + his-ipv6-addr ipv6-addr-local? if + unlock-link-addr + my-ipv6-addr-link-local + else + use-routerv6? if routerv6-en-addr his-en-addr copy-en-addr then + my-ipv6-addr-global + then + my-ipv6-addr copy-ipv6-addr then ; @@ -172,17 +236,17 @@ : ipv6-payload ( -- adr len ) the-struct /ipv6-header + ipv6-length xw@ ; +\ Skip checking his-ipv6-addr if it is an ICMPv6 packet which may come from anywhere. +: check-his-ipv6-addr? ( -- flag ) ipv6-next-hdr c@ IP_HDR_ICMPV6 <> ; : ipv6-addr-match? ( -- flag ) - \ If we know the server's IP address (e.g. the user specified one, or - \ we chose one from a RARP or BOOTP reply, or we locked onto one that - \ responded to a TFTP broadcast), then we silently discard IP packets - \ from other hosts. - his-ipv6-addr his-mc-ipv6-addr? 0= if - his-ipv6-addr ipv6-source-addr ipv6= 0= if false exit then + check-his-ipv6-addr? if + his-ipv6-addr his-ipv6-addr-mc? 0= if + his-ipv6-addr ipv6-source-addr ipv6= 0= if false exit then + then then \ Accept IP multicast packets - ipv6-dest-addr my-mc-ipv6-addr? if true exit then + ipv6-dest-addr my-ipv6-addr-mc? if true exit then \ If we don't know our own IP address yet, we accept every IP packet my-ipv6-addr unknown-ipv6-addr? if true exit then Modified: ofw/inetv6/neighdis.fth =================================================================== --- ofw/inetv6/neighdis.fth 2007-08-08 03:14:05 UTC (rev 530) +++ ofw/inetv6/neighdis.fth 2007-08-09 21:42:49 UTC (rev 531) @@ -3,10 +3,11 @@ headerless -" " d# 40 config-string ipv6-dns-server -" " d# 64 config-string ipv6-domain -" " d# 40 config-string ipv6-router -" stateless" d# 40 config-string ipv6-address \ leave room +d# 200 constant ND_TIMEOUT \ Neighbor discovery timeout (ms) +d# 200 constant DAD_TIMEOUT \ Duplicate Address Detection timeout (ms) +d# 500 constant RD_TIMEOUT \ Router Discovery timeout (ms) + +" stateless" d# 40 config-string ipv6-address \ leave room \ " dhcp" ' ipv6-address set-config-string-default [ifndef] include-ipv4 @@ -23,17 +24,22 @@ true ; +/ipv6 buffer: his-ipv6-addr-temp : do-neighbor-discovery ( -- ) bootnet-debug if ." ICMPv6 ND protocol: Getting MAC address for IP address: " his-ipv6-addr .ipv6 cr then - set-his-mc-en \ Set his multicast link address - send-neigh-sol \ Neighbor solicitation + his-ipv6-addr his-ipv6-addr-temp copy-ipv6-addr + set-his-en-addr-mc \ Set his multicast link address + set-his-ipv6-addr-mc + his-ipv6-addr-mc-sol-node his-ipv6-addr copy-ipv6-addr + his-ipv6-addr-temp send-neigh-sol \ Neighbor solicitation + his-ipv6-addr-temp his-ipv6-addr copy-ipv6-addr current-timeout >r - timeout-msecs @ set-timeout + ND_TIMEOUT set-timeout begin IP_HDR_ICMPV6 receive-ip-packet ?dup 0= if got-nd-ad? then until @@ -42,11 +48,6 @@ bootnet-debug if ." Got MAC address: " his-en-addr .enaddr cr then ; -: do-discovery ( -- ) - \ XXX need to do DHCPv6 discovery - his-ipv6-addr be-w@ h# fe80 = if do-neighbor-discovery then -; - : (resolve-en-addrv6) ( 'dest-adr type -- 'en-adr type ) dup IP_TYPE = if ( 'ip-adr ip-type ) [ifdef] include-ipv4 @@ -63,7 +64,7 @@ else ( 'dest-adr type ) dup IPV6_TYPE = if swap his-ipv6-addr copy-ipv6-addr - his-en-addr broadcast-en-addr en= if do-discovery then + his-en-addr broadcast-en-addr en= if do-neighbor-discovery then his-en-addr swap exit then then @@ -73,44 +74,113 @@ : s-all-ipv6 ( -- ) \ See discovery info bootnet-debug if - ." Initial configuration: (fixed) " cr - indent .my-ipv6-addr cr + ." My IPv6 configuration (stateless autoconfiguration): " cr + indent .my-ipv6-addr-link-local cr + my-ipv6-addr-global unknown-ipv6-addr? not if + indent .my-ipv6-addr-global cr + indent .my-prefix cr + then indent .my-link-addr cr + use-routerv6? if indent .routerv6-en-addr cr then then ; -create default-ipv6-addr h# fe c, h# 80 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, - 0 c, 0 c, 0 c, h# ff c, h# fe c, 0 c, 0 c, 0 c, -: set-my-ipv6-addr ( -- ) - default-ipv6-addr my-ipv6-addr copy-ipv6-addr - my-en-addr c@ 2 xor my-ipv6-addr 8 + c! - my-en-addr 1+ my-ipv6-addr 9 + 2 move - my-en-addr 3 + my-ipv6-addr d# 13 + 3 move +: detect-dad ( -- ) + DAD_TIMEOUT set-timeout + begin + IP_HDR_ICMPV6 receive-ip-packet + dup 0= if got-nd-ad? abort" Duplicate IPv6 address detected" then + until ; +: set-my-ipv6-addr-link-local ( -- ) + \ Duplicate Address Discovery + unknown-ipv6-addr my-ipv6-addr copy-ipv6-addr -: configure-ipv6 ( -- ) \ Get discovery info + default-ipv6-addr my-ipv6-addr-link-local copy-ipv6-addr + my-en-addr c@ 2 xor my-ipv6-addr-link-local 8 + c! + my-en-addr 1+ my-ipv6-addr-link-local 9 + 2 move + my-en-addr 3 + my-ipv6-addr-link-local d# 13 + 3 move + + set-my-ipv6-addr-mc + + ipv6-addr-mc-all-nodes his-ipv6-addr copy-ipv6-addr + set-his-en-addr-mc + my-ipv6-addr-link-local send-neigh-sol + detect-dad + + my-ipv6-addr-link-local my-ipv6-addr copy-ipv6-addr +; + +: process-rd-options ( adr len -- ) + begin dup 0> while + over c@ case + 1 of over 2 + routerv6-en-addr copy-en-addr endof \ Source link-layer address option + 3 of over 2 + c@ to /prefix \ Prefix option + over 3 + c@ to prefix-flag + over 8 + be-l@ to prefix-lifetime \ XXX lifetime + over d# 16 + my-prefix copy-ipv6-addr \ Prefix + endof + 5 of over 4 + be-l@ to (link-mtu) endof \ MTU option + endcase + over 1+ c@ 8 * /string + repeat 2drop +; +: process-rd? ( adr len -- router-ad? ) + over c@ d# 134 <> if drop false exit then \ Router advertisement? + over 4 + c@ to router-hop-limit + over 5 + c@ to router-flags \ XXX What to do with stateful config? + over 6 + be-w@ to router-lifetime + over 8 + be-l@ to router-reachable-time + over d# 12 + be-l@ to router-retrans-time + d# 16 /string ( opt-adr,len ) + process-rd-options ( ) + true +; +: auto-cfg-global? ( -- flag ) + my-prefix unknown-ipv6-addr? if false exit then + prefix-flag h# 40 and 0= if false exit then + /prefix d# 64 = \ XXX What to do with /prefix other than 64? +; +: discover-router ( -- ) + unknown-ipv6-addr my-ipv6-addr-global copy-ipv6-addr + ipv6-addr-mc-all-routers his-ipv6-addr copy-ipv6-addr + set-his-en-addr-mc + send-router-sol + + RD_TIMEOUT set-timeout + begin + IP_HDR_ICMPV6 receive-ip-packet ?dup 0= if process-rd? then + until + auto-cfg-global? not if exit then + + \ DAD on the global IPv6 address + my-ipv6-addr-link-local my-ipv6-addr-global copy-ipv6-addr + my-prefix my-ipv6-addr-global /prefix 8 / move \ XXX assume prefix multiple of 8 bits + + ipv6-addr-mc-all-nodes his-ipv6-addr copy-ipv6-addr + set-his-en-addr-mc + my-ipv6-addr-global send-neigh-sol + detect-dad +; + +: configure-ipv6 ( -- ) \ Get discovery info + use-ipv6? \ Save IPv6 flag + true to use-ipv6? + ['] 4drop to icmpv6-err-callback-xt ['] 2drop to icmpv6-info-callback-xt - d# 64 to prefix - set-my-ipv6-addr - set-my-mc-ipv6-addr + d# 64 to /prefix + set-my-ipv6-addr-link-local - \ XXX Duplicate address discovery; Router discovery - \ ::0 => ff02::1:ffb4:0061 hop-by-hop, multicast listener report - \ ::0 => ff02::2 router solicitation - \ ::0 => ff02::1:ffb4:0061 DAD, neighbor solicitation with target addr - \ Wait for router advertisement, if gotten, continue - \ For each prefix in router advertisement, combine prefix with interface id - \ Add address to the list of assigned addresses for the interface - \ All addresses must be verified with DAD - \ fe80::259:08ff:feb4:0061 => ff02::1:ffb4:0061 hop-by-hop, multicast listener report + discover-router + to use-ipv6? \ Restore IPv6 flag ; : configure ( -- ) - use-ipv6? \ Save IPv6 flag + use-ipv6? \ Save IPv6 flag false to use-ipv6? configure - to use-ipv6? \ Restore IPv6 flag + to use-ipv6? \ Restore IPv6 flag configure-ipv6 ; @@ -139,7 +209,7 @@ : open ( -- ok? ) [ifdef] include-ipv4 false to use-ipv6? - open 0= if false exit then \ IPv4 open + open 0= if false exit then \ IPv4 open [else] open-link parse-args @@ -147,11 +217,11 @@ my-self to obp-tftp-ih [then] true to use-ipv6? - ['] (resolve-en-addrv6) to resolve-en-addr + set-mc-hash if close false exit then configure-ipv6 - set-mc-hash if close false exit then s-all-ipv6 setup-ip-attr + ['] (resolve-en-addrv6) to resolve-en-addr true ; Modified: ofw/inetv6/supportv6.fth =================================================================== --- ofw/inetv6/supportv6.fth 2007-08-08 03:14:05 UTC (rev 530) +++ ofw/inetv6/supportv6.fth 2007-08-09 21:42:49 UTC (rev 531) @@ -6,6 +6,12 @@ d# 16 constant /ipv6 \ Bytes per IP address /ipv6 buffer: my-ipv6-addr +0 value router-hop-limit +0 value router-flags +0 value router-lifetime +0 value router-reachable-time +0 value router-retrans-time + : copy-ipv6-addr ( src dst -- ) /ipv6 move ; : .ipv6 ( buf -- ) @@ -107,7 +113,7 @@ " ::xyz" " 123::456:xyz" " xyz:123::456" -" 123:::456" \ Error was not caught! +" 123:::456" " 123" " 123:456" " ::192.xy.1.102" Modified: ofw/inetv6/tcpv6.fth =================================================================== --- ofw/inetv6/tcpv6.fth 2007-08-08 03:14:05 UTC (rev 530) +++ ofw/inetv6/tcpv6.fth 2007-08-09 21:42:49 UTC (rev 531) @@ -1356,7 +1356,7 @@ th_sport w@ th_dport w@ th_sport w! th_dport w! ; : multicast-dstv6? ( -- flag ) - ipv6-struct ihv6_dst tcpv6-struct ( adr ) " his-mc-ipv6-addr?" $call-parent + ipv6-struct ihv6_dst tcpv6-struct ( adr ) " his-ipv6-addr-mc?" $call-parent ; /ipv6 buffer: tmp-ipv6 : dropwithresetv6 ( -- )

1 0

r530 - dev/geode/display
by svn＠openbios.org 08 Aug '07

08 Aug '07

Author: wmb Date: 2007-08-08 05:14:05 +0200 (Wed, 08 Aug 2007) New Revision: 530 Modified: dev/geode/display/gp.fth dev/geode/display/gxfb.fth dev/geode/display/loadpkg.fth Log: OLPC display - sped up scrolling 20x by using the graphics processor. Modified: dev/geode/display/gp.fth =================================================================== --- dev/geode/display/gp.fth 2007-08-06 18:37:01 UTC (rev 529) +++ dev/geode/display/gp.fth 2007-08-08 03:14:05 UTC (rev 530) @@ -1,8 +1,6 @@ purpose: Geode LX graphics acceleration \ See license at end of file -dev screen - alias depth+ wa+ : gp! ( l reg -- ) gp-base + rl! ; @@ -70,9 +68,46 @@ ; [then] +: rc>pixels ( r c -- x y ) swap char-width * swap char-height * ; +: +window ( x y -- x' y' ) window-left 2/ window-top d+ ; +: rc>window ( r c -- x y ) rc>pixels +window ; -dend +: fbgeode-delete-lines ( delta-#lines -- ) + >r ( r: delta-#lines ) + 0 line# r@ + rc>window ( src-x,y r: delta ) + 0 line# rc>window ( src-x,y dst-x,y r: delta ) + #columns #lines r@ - rc>pixels ( src-x,y dst-x,y w,h r: delta ) + gp-move ( r: delta ) + screen-background16 ( color r: delta ) + 0 #lines r@ - rc>window ( color dst-x,y r: delta ) + #columns r> rc>pixels ( color dst-x,y w,h ) + gp-fill +; +: gp-fb16-install ( -- ) + fb16-install + gp-setup + ['] fbgeode-delete-lines is delete-lines +; + +: display-install ( -- ) + init-all + default-font set-font + /scanline bytes/pixel / #scanlines ( width height ) + over char-width / over char-height / ( width height rows cols ) + bytes/pixel case ( width height rows cols ) + 1 of fb8-install endof ( ) + 2 of gp-fb16-install endof ( ) + endcase ( ) + init-hook +; + +: display-selftest ( -- failed? ) false ; + +' display-install is-install +' display-remove is-remove +' display-selftest is-selftest + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: dev/geode/display/gxfb.fth =================================================================== --- dev/geode/display/gxfb.fth 2007-08-06 18:37:01 UTC (rev 529) +++ dev/geode/display/gxfb.fth 2007-08-08 03:14:05 UTC (rev 530) @@ -565,24 +565,6 @@ " ISO8859-1" encode-string " character-set" property 0 0 encode-bytes " iso6429-1983-colors" property -: display-install ( -- ) - init-all - default-font set-font - /scanline bytes/pixel / #scanlines ( width height ) - over char-width / over char-height / ( width height rows cols ) - bytes/pixel case ( width height rows cols ) - 1 of fb8-install endof ( ) - 2 of fb16-install endof ( ) - endcase ( ) - init-hook -; - -: display-selftest ( -- failed? ) false ; - -' display-install is-install -' display-remove is-remove -' display-selftest is-selftest - \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: dev/geode/display/loadpkg.fth =================================================================== --- dev/geode/display/loadpkg.fth 2007-08-06 18:37:01 UTC (rev 529) +++ dev/geode/display/loadpkg.fth 2007-08-08 03:14:05 UTC (rev 530) @@ -5,6 +5,7 @@ fload ${BP}/dev/geode/display/gxpci.fth \ PCI interfaces fload ${BP}/dev/geode/display/gxfb.fth \ Controller code +fload ${BP}/dev/geode/display/gp.fth \ Graphics processor support fload ${BP}/dev/video/common/rectangle16.fth \ Rectangular graphics \ LICENSE_BEGIN

1 0

r529 - ofw/inetv6
by svn＠openbios.org 06 Aug '07

06 Aug '07

Author: lwalter Date: 2007-08-06 20:37:01 +0200 (Mon, 06 Aug 2007) New Revision: 529 Modified: ofw/inetv6/http.fth Log: Support redirect and http-proxy Modified: ofw/inetv6/http.fth =================================================================== --- ofw/inetv6/http.fth 2007-08-06 18:26:17 UTC (rev 528) +++ ofw/inetv6/http.fth 2007-08-06 18:37:01 UTC (rev 529) @@ -5,6 +5,42 @@ false instance value debug? +h# 100 instance buffer: url +0 instance value /url +h# 80 instance buffer: proxy +0 instance value /proxy + +-1 value result-code +0 value image-size + +\ proxy should have the value of +\ 1. environment variable, http-proxy, if not null$ +\ 2. otherwise, devalias http-proxy, if not null$ +\ 3. Location: URL$ for status code 305 + +: set-proxy ( $ -- ) + \ strip "http://" or "http:\\" + over " http:" comp 0= if + 7 /string + else + over " HTTP:" comp 0= if 7 /string then + then + + dup to /proxy proxy swap move +; +: init-proxy ( -- ) + 0 to /proxy + " http-proxy" $getenv 0= if + ?dup if + set-proxy + exit + else + drop + then + then + " http-proxy" not-alias? 0= if set-proxy then +; + d# 255 instance buffer: pathbuf : fix-delims ( $ -- $' ) pathbuf pack count ( $' ) @@ -117,21 +153,17 @@ : decode-url ( url$ -- send$ prefix$ port# server$ ) fix-delims ( url$' ) - " http-proxy" not-alias? if ( url$ ) + /proxy 0= if url-parse null$ ( filename$ server$ prefix$ ) - bootnet-debug if ." HTTP Server " 2over type cr then - else ( url$ proxy$ ) - dup 0= if ( url$ proxy$ ) - 2drop url-parse null$ ( filename$ server$ prefix$ ) - bootnet-debug if ." HTTP Proxy server " 2over type cr then - else ( url$ proxy$ ) - " http:" ( url$ proxy$ prefix$ ) - then ( url$ proxy$ prefix$ ) + bootnet-debug if ." HTTP: Server is: " 2over type cr then + else ( url$ ) + proxy /proxy ( url$ proxy$ ) + bootnet-debug if ." HTTP: Proxy is: " 2dup type cr then + " http:" ( url$ proxy$ prefix$ ) then ( send$ server$ prefix$ ) 2swap parse-port ( send$ prefix$ port# server$ ) ; -0 value image-size --1 value result-code + vocabulary http-tags : parse-line ( adr len -- ) @@ -193,7 +225,7 @@ : get-number ( adr len -- n ) push-decimal $number pop-base throw ; : version-bad? ( $ -- flag ) - 2dup " HTTP/1.0" $= if 2drop false exit then ( $ ) + 2dup " HTTP/1.0" $= if 2drop false exit then ( $ ) 2dup " HTTP/1.1" $= if 2drop false else @@ -203,6 +235,11 @@ true then ; +: result-code-supported? ( # -- supported? ) + dup to result-code >r ( # ) + r@ d# 200 = r@ d# 301 d# 303 between or + r@ d# 305 = or r> d# 307 = or +; : dump-response ( -- ) begin get-line dup while type cr repeat ; @@ -212,15 +249,10 @@ abort" HTTP: Bad version line" ( rem$ ) skipwhite scanwhite ( rem$ head$ ) get-number ( rem$ # ) - \ XXX should handle 3xx redirects - dup d# 200 <> if ( rem$ # ) + dup result-code-supported? not if ( rem$ # ) bootnet-debug if ( rem$ # ) - dup d# 302 = if - ." HTTP: Response: " .d type cr ( ) - dump-response - else - ." HTTP: Bad response: " .d type cr ( ) - then + ." HTTP: Bad response: " .d type cr ( ) + dump-response then ( | rem$ # ) abort ( ) else 3drop then ( ) @@ -242,6 +274,7 @@ \ Content-type: text/html \ Content-length: 10696 \ Last-modified: Thu, 11 Feb 1999 01:08:12 GMT +\ Location: http://www.w3.org/TheProject.html : content-length ( $ -- ) \ [<white>] length skipwhite scanwhite ( tail$ head$ ) @@ -249,6 +282,19 @@ get-number ( size ) to image-size ; +: location ( $ -- ) \ [<white>] url$ + skipwhite scanwhite ( tail$ head$ ) + 2swap 2drop ( head$ ) + ascii : left-parse-string 2drop ( head$' ) + result-code d# 305 = if + set-proxy + else + dup to /url ( head$ ) + url swap move ( ) + null$ set-proxy + bootnet-debug if ." HTTP: Location: " url /url type cr then + then +; previous definitions @@ -259,7 +305,7 @@ check-status-line begin get-line dup while parse-header-line repeat 2drop ; -: mount ( $url -- error? ) +: (mount) ( $url -- error? ) decode-url ( send$ prefix$ port# server$ ) 2dup set-server ( send$ prefix$ port# server$ ) @@ -284,9 +330,18 @@ ['] check-header catch ; +: mount ( url$ -- error? ) + dup to /url 2dup url swap move + begin (mount) 0= if result-code d# 200 <> else false then while + " disconnect" $call-parent + url /url + repeat + result-code d# 200 <> +; : open ( -- ) my-args dup if + init-proxy bootnet-debug if 2dup ." HTTP: URL is: " type cr then

1 0

r528 - ofw/inetv6
by svn＠openbios.org 06 Aug '07

06 Aug '07

Author: lwalter Date: 2007-08-06 20:26:17 +0200 (Mon, 06 Aug 2007) New Revision: 528 Modified: ofw/inetv6/ping.fth ofw/inetv6/pingv6.fth Log: ping is IPv4 and IPv6 independent Modified: ofw/inetv6/ping.fth =================================================================== --- ofw/inetv6/ping.fth 2007-08-06 01:11:12 UTC (rev 527) +++ ofw/inetv6/ping.fth 2007-08-06 18:26:17 UTC (rev 528) @@ -239,13 +239,16 @@ loop ; -: $ping ( ip$ -- ) - " net//obp-tftp:last" open-net " $set-host" $call-net +: (ping) ( -- ) /ping-max " allocate-ip" $call-net to ping-packet try-pings ping-packet /ping-max " free-ip" $call-net close-net ; +: $ping ( ip$ -- ) + " net//obp-tftp:last" open-net " $set-host" $call-net + (ping) +; : ping ( "host" -- ) safe-parse-word $ping ; \ LICENSE_BEGIN Modified: ofw/inetv6/pingv6.fth =================================================================== --- ofw/inetv6/pingv6.fth 2007-08-06 01:11:12 UTC (rev 527) +++ ofw/inetv6/pingv6.fth 2007-08-06 18:26:17 UTC (rev 528) @@ -129,16 +129,29 @@ loop ; -: $ping6 ( ip$ -- ) - " net//obp-tftp:last" open-net " $set-host" $call-net +: (ping6) ( -- ) /ping-max " allocate-ipv6" $call-net to ping-packet try-pingsv6 ping-packet /ping-max " free-ipv6" $call-net close-net ; +: $ping6 ( ip$ -- ) + " net//obp-tftp:last" open-net " $set-host" $call-net + (ping6) +; : ping6 ( "host" -- ) safe-parse-word $ping6 ; +[ifdef] include-ipv4 +: $ping ( ip$ -- ) + " net//obp-tftp:last" open-net " $set-host" $call-net + " use-ipv6?" $call-net if (ping6) else (ping) then +; +[else] +: $ping ( ip$ -- ) $ping6 ; +[then] +: ping ( "host" -- ) safe-parse-word $ping ; + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \

1 0

← Newer
1
...
5
6
7
8
9
10
11
Older →