sd-icmp6-nd: rename files to sd-ndisc

The actual code rename will follow. The reason for the change of name is to make it
simpler and more uniform with how we name other libraries (we don't include the
underlying protocol). The new name also matches the naming in the kernel (which
is particularly relevent here as we expect to let the kernel do some parts of
the protocol and we do others).

diff --git a/.gitignore b/.gitignore
index 709c8b53d08e84c31f1f57f358024d379301ea9a..b47bd1b2f2ec8d1154eaacbd3dc0dfe29e6b2d5e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -195,7 +195,7 @@
 /test-hashmap
 /test-hostname
 /test-hostname-util
-/test-icmp6-rs
+/test-ndisc-rs
 /test-id128
 /test-inhibit
 /test-install

diff --git a/Makefile.am b/Makefile.am
index e210d8a2dae49a5cfcecc5b54d61fac3ed01ac57..eba47e4e12da256fcba69c6cecafb9fe385e945a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3214,7 +3214,7 @@ libsystemd_network_la_SOURCES = \
        src/systemd/sd-dhcp-lease.h \
        src/systemd/sd-ipv4ll.h \
        src/systemd/sd-ipv4acd.h \
-       src/systemd/sd-icmp6-nd.h \
+       src/systemd/sd-ndisc.h \
        src/systemd/sd-dhcp6-client.h \
        src/systemd/sd-dhcp6-lease.h \
        src/systemd/sd-pppoe.h \
@@ -3236,7 +3236,7 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/sd-pppoe.c \
        src/libsystemd-network/network-internal.c \
        src/libsystemd-network/network-internal.h \
-       src/libsystemd-network/sd-icmp6-nd.c \
+       src/libsystemd-network/sd-ndisc.c \
        src/libsystemd-network/sd-dhcp6-client.c \
        src/libsystemd-network/dhcp6-internal.h \
        src/libsystemd-network/dhcp6-protocol.h \
@@ -3320,15 +3320,15 @@ test_pppoe_LDADD = \
        libsystemd-network.la \
        libshared.la
 
-test_icmp6_rs_SOURCES = \
+test_ndisc_rs_SOURCES = \
        src/systemd/sd-dhcp6-client.h \
-       src/systemd/sd-icmp6-nd.h \
+       src/systemd/sd-ndisc.h \
        src/libsystemd-network/dhcp6-internal.h \
-       src/libsystemd-network/test-icmp6-rs.c \
+       src/libsystemd-network/test-ndisc-rs.c \
        src/libsystemd-network/dhcp-identifier.h \
        src/libsystemd-network/dhcp-identifier.c
 
-test_icmp6_rs_LDADD = \
+test_ndisc_rs_LDADD = \
        libsystemd-network.la \
        libudev.la \
        libshared.la
@@ -3360,7 +3360,7 @@ tests += \
        test-dhcp-client \
        test-dhcp-server \
        test-ipv4ll \
-       test-icmp6-rs \
+       test-ndisc-rs \
        test-dhcp6-client \
        test-lldp
 

diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c
index 2a62af2fd47936058f4311dd53cec9412377176e..a33affb7735de4a7599901a7e749b88158edee98 100644 (file)
--- a/src/libsystemd-network/network-internal.c
+++ b/src/libsystemd-network/network-internal.c
@@ -32,7 +32,7 @@
 #include "conf-parser.h"
 #include "condition.h"
 #include "network-internal.h"
-#include "sd-icmp6-nd.h"
+#include "sd-ndisc.h"
 
 const char *net_get_name(struct udev_device *device) {
         const char *name, *field;

diff --git a/src/libsystemd-network/sd-icmp6-nd.c b/src/libsystemd-network/sd-ndisc.c
similarity index 99%
rename from src/libsystemd-network/sd-icmp6-nd.c
rename to src/libsystemd-network/sd-ndisc.c
index f014cac628529fef01e207590f94ab966c2ed80e..8545344fd709281cea1f56a4f264315d8d41ad10 100644 (file)
--- a/src/libsystemd-network/sd-icmp6-nd.c
+++ b/src/libsystemd-network/sd-ndisc.c
@@ -28,7 +28,7 @@
 #include "async.h"
 
 #include "dhcp6-internal.h"
-#include "sd-icmp6-nd.h"
+#include "sd-ndisc.h"
 
 #define ICMP6_ROUTER_SOLICITATION_INTERVAL      4 * USEC_PER_SEC
 #define ICMP6_MAX_ROUTER_SOLICITATIONS          3

diff --git a/src/libsystemd-network/test-icmp6-rs.c b/src/libsystemd-network/test-ndisc-rs.c
similarity index 99%
rename from src/libsystemd-network/test-icmp6-rs.c
rename to src/libsystemd-network/test-ndisc-rs.c
index 27b0ef45724f630451e4d29b5a7eaa0b8a1f2b85..49305e297b93d2b40de20a83138a635025eed1af 100644 (file)
--- a/src/libsystemd-network/test-icmp6-rs.c
+++ b/src/libsystemd-network/test-ndisc-rs.c
@@ -24,7 +24,7 @@
 #include "socket-util.h"
 
 #include "dhcp6-internal.h"
-#include "sd-icmp6-nd.h"
+#include "sd-ndisc.h"
 
 static struct ether_addr mac_addr = {
         .ether_addr_octet = {'A', 'B', 'C', '1', '2', '3'}

diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
index fb93e6606ebdac657069b2c12784a537da68096c..e572ad45953569af08f1c03c3a448fd5fa70bf8d 100644 (file)
--- a/src/network/networkd-dhcp6.c
+++ b/src/network/networkd-dhcp6.c
@@ -25,7 +25,7 @@
 #include "networkd-link.h"
 #include "network-internal.h"
 
-#include "sd-icmp6-nd.h"
+#include "sd-ndisc.h"
 #include "sd-dhcp6-client.h"
 
 static int dhcp6_lease_address_acquired(sd_dhcp6_client *client, Link *link);

diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index af2ba11701b8a23a49881c7fab51068a5ca85bf6..5bba313049e5767c39b80a84f7cf895a0b065f32 100644 (file)
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -26,7 +26,7 @@
 #include "sd-dhcp-client.h"
 #include "sd-dhcp-server.h"
 #include "sd-ipv4ll.h"
-#include "sd-icmp6-nd.h"
+#include "sd-ndisc.h"
 #include "sd-dhcp6-client.h"
 #include "sd-lldp.h"
 

diff --git a/src/systemd/sd-icmp6-nd.h b/src/systemd/sd-ndisc.h
similarity index 98%
rename from src/systemd/sd-icmp6-nd.h
rename to src/systemd/sd-ndisc.h
index cb6c24a0cb97103fe3f34d0bef0519a19b4a1682..240feb7bbe96807ac3200823c3e12f35efd4496f 100644 (file)
--- a/src/systemd/sd-icmp6-nd.h
+++ b/src/systemd/sd-ndisc.h
@@ -1,7 +1,7 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foosdicmp6ndfoo
-#define foosdicmp6ndfoo
+#ifndef foosdndiscfoo
+#define foosdndiscfoo
 
 /***
   This file is part of systemd.