diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-02-09 20:19:01 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-02-09 20:19:01 -0800 |
| commit | dae556e5aa0913a7901db9cfa7497d2bb3425d8b (patch) | |
| tree | 8c55457050ea25119ee65a0b5b6714774c818454 | |
| parent | 35b3ab1920653562090857a5cdaded74dcde9775 (diff) | |
| parent | f296cefb2fdb31a52e93f205edc3d8c7b157c051 (diff) | |
Merge pull request #2084 from amatus/push-upstream
Remove _-prefix from in6addr_*
| -rw-r--r-- | src/library.js | 14 | ||||
| -rw-r--r-- | tests/netinet/in.cpp | 14 | ||||
| -rw-r--r-- | tests/netinet/in.out | 1 | ||||
| -rw-r--r-- | tests/test_core.py | 5 |
4 files changed, 22 insertions, 12 deletions
diff --git a/src/library.js b/src/library.js index d46243a6..8f5010ad 100644 --- a/src/library.js +++ b/src/library.js @@ -7354,20 +7354,10 @@ LibraryManager.library = { // netinet/in.h // ========================================================================== - _in6addr_any: + in6addr_any: 'allocate([0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0], "i8", ALLOC_STATIC)', - _in6addr_loopback: + in6addr_loopback: 'allocate([0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1], "i8", ALLOC_STATIC)', - _in6addr_linklocal_allnodes: - 'allocate([255,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1], "i8", ALLOC_STATIC)', - _in6addr_linklocal_allrouters: - 'allocate([255,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2], "i8", ALLOC_STATIC)', - _in6addr_interfacelocal_allnodes: - 'allocate([255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1], "i8", ALLOC_STATIC)', - _in6addr_interfacelocal_allrouters: - 'allocate([255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2], "i8", ALLOC_STATIC)', - _in6addr_sitelocal_allrouters: - 'allocate([255,5,0,0,0,0,0,0,0,0,0,0,0,0,0,2], "i8", ALLOC_STATIC)', // ========================================================================== // netdb.h diff --git a/tests/netinet/in.cpp b/tests/netinet/in.cpp new file mode 100644 index 00000000..eaadfba2 --- /dev/null +++ b/tests/netinet/in.cpp @@ -0,0 +1,14 @@ +#include <netinet/in.h> +extern "C" int puts(const char *); +int main() { + struct in6_addr in6any = IN6ADDR_ANY_INIT; + struct in6_addr in6loopback = IN6ADDR_LOOPBACK_INIT; + int i; + for (i = 0; i < 16; ++i) + if (in6any.s6_addr[i] != in6addr_any.s6_addr[i]) + return puts("in6addr_any != IN6ADDR_ANY_INIT\n"); + for (i = 0; i < 16; ++i) + if (in6loopback.s6_addr[i] != in6addr_loopback.s6_addr[i]) + return puts("in6addr_loopback != IN6ADDR_LOOPBACK_INIT\n"); + return puts("pass"); +} diff --git a/tests/netinet/in.out b/tests/netinet/in.out new file mode 100644 index 00000000..2ae28399 --- /dev/null +++ b/tests/netinet/in.out @@ -0,0 +1 @@ +pass diff --git a/tests/test_core.py b/tests/test_core.py index a77d2465..7c3c8857 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -4376,6 +4376,11 @@ PORT: 3979 self.do_run_from_file(src, output) + def test_netinet_in(self): + src = open(path_from_root('tests', 'netinet', 'in.cpp'), 'r').read() + expected = open(path_from_root('tests', 'netinet', 'in.out'), 'r').read() + self.do_run(src, expected) + # libc++ tests def test_iostream(self): |