diff options
| author | Patrick McHardy <kaber@trash.net> | 2006-12-02 22:04:04 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-12-02 22:04:04 -0800 |
| commit | 9a7c9337a09b1ef07e55f95a4309957a2328a01f (patch) | |
| tree | 9d382a443d82ece7246fe83d297865b66ace713f /include/linux/inet.h | |
| parent | a163148c1bec895c1332ea5be497bcda8ce110df (diff) | |
| download | linux-stable-9a7c9337a09b1ef07e55f95a4309957a2328a01f.tar.gz linux-stable-9a7c9337a09b1ef07e55f95a4309957a2328a01f.tar.bz2 linux-stable-9a7c9337a09b1ef07e55f95a4309957a2328a01f.zip | |
[NET]: Accept wildcard delimiters in in[46]_pton
Accept -1 as delimiter to abort parsing without an error at the first
unknown character. This is needed by the upcoming nf_conntrack SIP
helper, where addresses are delimited by either '\r' or '\n' characters.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/inet.h')
| -rw-r--r-- | include/linux/inet.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/inet.h b/include/linux/inet.h index b7c6da7d6d32..675a7dbe86f8 100644 --- a/include/linux/inet.h +++ b/include/linux/inet.h @@ -46,7 +46,7 @@ #include <linux/types.h> extern __be32 in_aton(const char *str); -extern int in4_pton(const char *src, int srclen, u8 *dst, char delim, const char **end); -extern int in6_pton(const char *src, int srclen, u8 *dst, char delim, const char **end); +extern int in4_pton(const char *src, int srclen, u8 *dst, int delim, const char **end); +extern int in6_pton(const char *src, int srclen, u8 *dst, int delim, const char **end); #endif #endif /* _LINUX_INET_H */ |