diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2014-11-08 05:23:59 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2014-11-08 05:23:59 +0100 |
| commit | 4908ea43d7603c435038de6739dd4589585b071b (patch) | |
| tree | ff4e2d02ebb66e7bfef2bb210f4624c1da35b001 /sys/src | |
| parent | cd3a742b324a1256d52b42b82a90d335903f68e7 (diff) | |
| parent | 9dfe587b27af607a5bcfb9b695c642b7521c2d0d (diff) | |
merge
Diffstat (limited to 'sys/src')
| -rw-r--r-- | sys/src/cmd/upas/smtp/smtpd.y | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/sys/src/cmd/upas/smtp/smtpd.y b/sys/src/cmd/upas/smtp/smtpd.y index 939b8905d..7c8ccc918 100644 --- a/sys/src/cmd/upas/smtp/smtpd.y +++ b/sys/src/cmd/upas/smtp/smtpd.y @@ -102,7 +102,7 @@ domain : element ={ $$ = cat(&$1, 0, 0, 0, 0 ,0, 0); } element : name ={ $$ = cat(&$1, 0, 0, 0, 0 ,0, 0); } | '#' number ={ $$ = cat(&$1, &$2, 0, 0, 0 ,0, 0); } | '[' ']' ={ $$ = cat(&$1, &$2, 0, 0, 0 ,0, 0); } - | '[' dotnum ']' ={ $$ = cat(&$1, &$2, &$3, 0, 0 ,0, 0); } + | '[' ipaddr ']' ={ $$ = cat(&$1, &$2, &$3, 0, 0 ,0, 0); } ; mailbox : local_part ={ $$ = cat(&$1, 0, 0, 0, 0 ,0, 0); } | local_part '@' domain ={ $$ = cat(&$3, bang, &$1, 0, 0 ,0, 0); } @@ -142,13 +142,31 @@ qtext : '\\' x ={ $$ = cat(&$2, 0, 0, 0, 0 ,0, 0); } char : c | '\\' x ={ $$ = $2; } ; -dotnum : snum '.' snum '.' snum '.' snum ={ $$ = cat(&$1, &$2, &$3, &$4, &$5, &$6, &$7); } +ipaddr : ipv4addr ={ $$ = cat(&$1, 0, 0, 0, 0, 0, 0); } + | 'i' 'p' 'v' '6' ':' ipv6addr ={ $$ = cat(&$6, 0, 0, 0, 0, 0, 0); } ; -number : d ={ $$ = cat(&$1, 0, 0, 0, 0 ,0, 0); } - | number d ={ $$ = cat(&$1, &$2, 0, 0, 0 ,0, 0); } +ipv6addr : ipv6addr_list ={ $$ = cat(&$1, 0, 0, 0, 0, 0, 0); } + | ipv6addr_list ':' ':' ipv6addr_list ={ $$ = cat(&$1, &$2, &$3, &$4, 0, 0, 0); } + | ':' ':' ipv6addr_list ={ $$ = cat(&$1, &$2, &$3, 0, 0, 0, 0); } + ; +ipv6addr_list : ipv6addr_elem ={ $$ = cat(&$1, 0, 0, 0, 0, 0, 0); } + | ipv6addr_list ':' ipv6addr_elem ={ $$ = cat(&$1, &$2, &$3, 0, 0, 0, 0); } + ; +ipv6addr_elem : hnum ={ $$ = cat(&$1, 0, 0, 0, 0, 0, 0); } + | ipv4addr ={ $$ = cat(&$1, 0, 0, 0, 0, 0, 0); } + ; +ipv4addr : snum '.' snum '.' snum '.' snum ={ $$ = cat(&$1, &$2, &$3, &$4, &$5, &$6, &$7); } + ; +number : d ={ $$ = cat(&$1, 0, 0, 0, 0, 0, 0); } + | number d ={ $$ = cat(&$1, &$2, 0, 0, 0, 0, 0); } ; snum : number ={ if(atoi(s_to_c($1.s)) > 255) fprint(2, "bad snum\n"); } ; +hnum : h ={ $$ = cat(&$1, 0, 0, 0, 0, 0, 0); } + | h h ={ $$ = cat(&$1, &$2, 0, 0, 0, 0, 0); } + | h h h ={ $$ = cat(&$1, &$2, &$3, 0, 0, 0, 0); } + | h h h h ={ $$ = cat(&$1, &$2, &$3, &$4, 0, 0, 0); } + ; spaces : SPACE ={ $$ = $1; } | SPACE spaces ={ $$ = $1; } ; @@ -172,6 +190,8 @@ a : 'a' | 'b' | 'c' | 'd' | 'e' | 'f' | 'g' | 'h' | 'i' ; d : '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' ; +h : d | 'a' | 'b' | 'c' | 'd' | 'e' | 'f' + ; c : a | d | notspecial ; q : a | d | special1 | notspecial | SPACE |