diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-10 12:50:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-10 12:50:38 -0400 |
| commit | 5d8336c182777c36ebff561b420d67fcafb9a9f7 (patch) | |
| tree | f77e42894f28c0050540a55fea414eed5deb6691 /src/lib/net/include.am | |
| parent | ef106ce7884b0af7adcf9f3965ebbe843a47912c (diff) | |
| download | tor-5d8336c182777c36ebff561b420d67fcafb9a9f7.tar.gz tor-5d8336c182777c36ebff561b420d67fcafb9a9f7.zip | |
Refactor ipv[46].[ch]
These are now combined into an inaddr.[ch], since their purpose is
to implement functions for struct in_addr and struct in6_addr.
The definitions for in6_addr and its allies are now in a separate
header, inaddr_st.h.
Closes ticket 26532.
Diffstat (limited to 'src/lib/net/include.am')
| -rw-r--r-- | src/lib/net/include.am | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/net/include.am b/src/lib/net/include.am index 6fda173614..67db0d5af2 100644 --- a/src/lib/net/include.am +++ b/src/lib/net/include.am @@ -10,8 +10,7 @@ src_lib_libtor_net_a_SOURCES = \ src/lib/net/alertsock.c \ src/lib/net/buffers_net.c \ src/lib/net/gethostname.c \ - src/lib/net/ipv4.c \ - src/lib/net/ipv6.c \ + src/lib/net/inaddr.c \ src/lib/net/resolve.c \ src/lib/net/socket.c @@ -25,8 +24,8 @@ noinst_HEADERS += \ src/lib/net/alertsock.h \ src/lib/net/buffers_net.h \ src/lib/net/gethostname.h \ - src/lib/net/ipv4.h \ - src/lib/net/ipv6.h \ + src/lib/net/inaddr.h \ + src/lib/net/inaddr_st.h \ src/lib/net/nettypes.h \ src/lib/net/resolve.h \ src/lib/net/socket.h \ |