steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ip-parser: adding ntoa and aton words.

db4
John Benediktsson 2014-02-09 10:58:47 -08:00
parent ab4a058b2c
commit dcf1e6b9f3
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extra/ip-parser/ip-parser-tests.factor
View File

@ -21,3 +21,6 @@ IN: ip-parser
"74.0175.0xe2.4" "74.0175.0xe2.4"
} [ parse-ipv4 "74.125.226.4" = ] all? } [ parse-ipv4 "74.125.226.4" = ] all?
] unit-test ] unit-test
{ "174.36.207.186" } [ 2921648058 ipv4-ntoa ] unit-test
{ 2921648058 } [ "174.36.207.186" ipv4-aton ] unit-test

29
extra/ip-parser/ip-parser.factor
View File

@ -1,11 +1,14 @@
! Copyright (C) 2012 John Benediktsson ! Copyright (C) 2012 John Benediktsson
! See http://factorcode.org/license.txt for BSD license ! See http://factorcode.org/license.txt for BSD license
USING: combinators combinators.short-circuit kernel locals math USING: combinators combinators.short-circuit formatting kernel
math.parser sequences splitting ; literals locals math math.bitwise math.parser sequences
splitting ;
IN: ip-parser IN: ip-parser
ERROR: invalid-ipv4 str ;
<PRIVATE <PRIVATE
: cleanup-octal ( str -- str ) : cleanup-octal ( str -- str )
@ -19,17 +22,25 @@ IN: ip-parser
reverse 0 swap [ + 256 /mod ] map reverse nip ; reverse 0 swap [ + 256 /mod ] map reverse nip ;
: join-components ( array -- str ) : join-components ( array -- str )
bubble [ number>string ] map "." join ; [ number>string ] map "." join ;
PRIVATE> : (parse-ipv4) ( str -- array )
ERROR: invalid-ipv4 str ;
: parse-ipv4 ( str -- ip )
dup split-components dup length { dup split-components dup length {
{ 1 [ { 0 0 0 } prepend ] } { 1 [ { 0 0 0 } prepend ] }
{ 2 [ first2 [| A D | { A 0 0 D } ] call ] } { 2 [ first2 [| A D | { A 0 0 D } ] call ] }
{ 3 [ first3 [| A B D | { A B 0 D } ] call ] } { 3 [ first3 [| A B D | { A B 0 D } ] call ] }
{ 4 [ ] } { 4 [ ] }
[ drop invalid-ipv4 ] [ drop invalid-ipv4 ]
} case join-components nip ; } case bubble nip ;
PRIVATE>
: parse-ipv4 ( str -- ip )
(parse-ipv4) join-components ;
: ipv4-ntoa ( integer -- ip )
$[ { -24 -16 -8 0 } [ [ shift 8 bits ] curry ] map ]
cleave "%s.%s.%s.%s" sprintf ;
: ipv4-aton ( ip -- integer )
(parse-ipv4) { 24 16 8 0 } [ shift ] [ + ] 2map-reduce ;