diff options
| author | Sergey Poznyakoff <gray@gnu.org> | 2014-09-25 08:42:57 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org> | 2014-09-25 08:53:52 +0300 |
| commit | c711cf9ecbbe0df7f7f27cec789a75c0b4e39040 (patch) | |
| tree | 6ca6ae15720c1da84f30e430ef39964867061b24 /src/format.c | |
| parent | 82658ac36ae527e7d1cd949fb379ef26caad31cb (diff) | |
| download | grecs-c711cf9ecbbe0df7f7f27cec789a75c0b4e39040.tar.gz grecs-c711cf9ecbbe0df7f7f27cec789a75c0b4e39040.tar.bz2 | |
Add support for IPv6, multiple addresses and CIDRs.
* am/grecs.m4 (GRECS_SETUP): New option sockaddr-list.
Build grecs.h at configure stage.
* src/Make.am (GRECS_SRC): Add cidr.c and ipstr.c
[GRECS_COND_SOCKADDR_LIST] (GRECS_SRC): Add sockaddr.c
Remove rule for building grecs.h (see above).
* src/cidr.c: New file.
* src/ipstr.c: New file.
* src/sockaddr.c: New file.
* src/format.c (grecs_data_type_string): Change spelling of sockaddr.
* src/grecs-lex.l: Treat square brackets as part of word.
* src/grecs.hin (GRECS_SOCKADDR_LIST): New define.
[GRECS_SOCKADDR_LIST] (grecs_sockaddr): New member: next.
(grecs_str_is_ipv4,grecs_str_is_ipv6)
(grecs_str_is_ipaddr,grecs_str_is_num): New functions.
[GRECS_SOCKADDR_LIST] (grecs_sockaddr_hints): New struct.
[GRECS_SOCKADDR_LIST] (grecs_sockaddr_new,grecs_sockaddr_free)
(grecs_str_to_sockaddr): New protos.
(grecs_cidr): New struct.
(grecs_str_to_cidr,grecs_sockaddr_to_cidr)
(grecs_sockadd_cidr_match): New protos.
* src/tree.c [GRECS_SOCKADDR_LIST] (grecs_sockaddr_hints): New global.
[!GRECS_SOCKADDR_LIST] (string_to_sockaddr): Retain for backward
compatibility.
[GRECS_SOCKADDR_LIST] (grecs_string_convert): Use grecs_str_to_sockaddr.
(grecs_prop_tab): Add entry for grecs_type_cidr
Diffstat (limited to 'src/format.c')
| -rw-r--r-- | src/format.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/format.c b/src/format.c index c554cc9..d010729 100644 --- a/src/format.c +++ b/src/format.c @@ -61,7 +61,7 @@ grecs_data_type_string(enum grecs_data_type type) return "hostname"; case grecs_type_sockaddr: - return "sock-addr"; + return "sockaddr"; case grecs_type_section: return "section"; |