netgraph: increase size of sockaddr_ng to match maximum node name

[glebius]

Summary

The ng_socket(4) node already writes more than declared size of the
struct at least in the in ng_getsockaddr(). Make size match size of
a node name. The value is pasted instead of including ng_message.h
into ng_socket.h. This is external API and we want to keep it stable
even if NG_NODESIZ is redefined in a kernel build.

sys/netgraph/ng_message.h

struct i2c_hid_desc {
         uint16_t wVersionID;
         uint32_t reserved;
 } __packed;
 
 #define IICHID_REG_NONE -1
 #define IICHID_REG_ACPI (UINT16_MAX + 1)
 #define IICHID_REG_ELAN 0x0001
 
-static const struct iichid_id {
-        char *id;
-        int reg;
-} iichid_ids[] = {
-        { "ELAN0000",        IICHID_REG_ELAN },
-        { "PNP0C50",  IICHID_REG_ACPI },
-        { "ACPI0C50", IICHID_REG_ACPI },
-        { NULL,         0 },
+static char * iichid_ids[] = {
+        "ELAN0000",
+        "PNP0C50",
+        "ACPI0C50",
+        NULL,
 };
 
+static int iichid_regs[] = {
+        IICHID_REG_ELAN,
+        IICHID_REG_ACPI,
+        IICHID_REG_ACPI,
+        IICHID_REG_NONE,
+};
+
 enum iichid_powerstate_how {
         IICHID_PS_NULL,
         IICHID_PS_ON,
         IICHID_PS_OFF,
 };
 
 /*
  * Locking: no internal locks are used. To serialize access to shared members,

 static int        iichid_setup_callout(struct iichid_softc *);
 static int        iichid_reset_callout(struct iichid_softc *);
 static void        iichid_teardown_callout(struct iichid_softc *);
 #endif
 
 static inline int
 acpi_is_iichid(ACPI_HANDLE handle)
 {
-        const struct iichid_id *ids;
         UINT32  sta;
-        int reg;
+        int i, reg = IICHID_REG_NONE;
 
-        for (ids = iichid_ids; ids->id != NULL; ids++) {
-                if (acpi_MatchHid(handle, ids->id)) {
-                        reg = ids->reg;
+    for (i = 0; i < nitems(iichid_ids); i++) {
+                if (acpi_MatchHid(handle, iichid_ids[i])) {
+                        reg = iichid_regs[i];
                         break;
                 }
         }
-        if (ids->id == NULL)
+        if (reg == IICHID_REG_NONE)
                 return (IICHID_REG_NONE);
 
         /*
          * If no _STA method or if it failed, then assume that
          * the device is present.
          */
         if (ACPI_FAILURE(acpi_GetInteger(handle, "_STA", &sta)) ||
             ACPI_DEVICE_PRESENT(sta))

sys/netgraph/ng_socket.h

struct i2c_hid_desc {
         uint16_t wVersionID;
         uint32_t reserved;
 } __packed;
 
 #define IICHID_REG_NONE -1
 #define IICHID_REG_ACPI (UINT16_MAX + 1)
 #define IICHID_REG_ELAN 0x0001
 
-static const struct iichid_id {
-        char *id;
-        int reg;
-} iichid_ids[] = {
-        { "ELAN0000",        IICHID_REG_ELAN },
-        { "PNP0C50",  IICHID_REG_ACPI },
-        { "ACPI0C50", IICHID_REG_ACPI },
-        { NULL,         0 },
+static char * iichid_ids[] = {
+        "ELAN0000",
+        "PNP0C50",
+        "ACPI0C50",
+        NULL,
 };
 
+static int iichid_regs[] = {
+        IICHID_REG_ELAN,
+        IICHID_REG_ACPI,
+        IICHID_REG_ACPI,
+        IICHID_REG_NONE,
+};
+
 enum iichid_powerstate_how {
         IICHID_PS_NULL,
         IICHID_PS_ON,
         IICHID_PS_OFF,
 };
 
 /*
  * Locking: no internal locks are used. To serialize access to shared members,

 static int        iichid_setup_callout(struct iichid_softc *);
 static int        iichid_reset_callout(struct iichid_softc *);
 static void        iichid_teardown_callout(struct iichid_softc *);
 #endif
 
 static inline int
 acpi_is_iichid(ACPI_HANDLE handle)
 {
-        const struct iichid_id *ids;
         UINT32  sta;
-        int reg;
+        int i, reg = IICHID_REG_NONE;
 
-        for (ids = iichid_ids; ids->id != NULL; ids++) {
-                if (acpi_MatchHid(handle, ids->id)) {
-                        reg = ids->reg;
+    for (i = 0; i < nitems(iichid_ids); i++) {
+                if (acpi_MatchHid(handle, iichid_ids[i])) {
+                        reg = iichid_regs[i];
                         break;
                 }
         }
-        if (ids->id == NULL)
+        if (reg == IICHID_REG_NONE)
                 return (IICHID_REG_NONE);
 
         /*
          * If no _STA method or if it failed, then assume that
          * the device is present.
          */
         if (ACPI_FAILURE(acpi_GetInteger(handle, "_STA", &sta)) ||
             ACPI_DEVICE_PRESENT(sta))

tests/sys/netgraph/socket.c

struct i2c_hid_desc {
         uint16_t wVersionID;
         uint32_t reserved;
 } __packed;
 
 #define IICHID_REG_NONE -1
 #define IICHID_REG_ACPI (UINT16_MAX + 1)
 #define IICHID_REG_ELAN 0x0001
 
-static const struct iichid_id {
-        char *id;
-        int reg;
-} iichid_ids[] = {
-        { "ELAN0000",        IICHID_REG_ELAN },
-        { "PNP0C50",  IICHID_REG_ACPI },
-        { "ACPI0C50", IICHID_REG_ACPI },
-        { NULL,         0 },
+static char * iichid_ids[] = {
+        "ELAN0000",
+        "PNP0C50",
+        "ACPI0C50",
+        NULL,
 };
 
+static int iichid_regs[] = {
+        IICHID_REG_ELAN,
+        IICHID_REG_ACPI,
+        IICHID_REG_ACPI,
+        IICHID_REG_NONE,
+};
+
 enum iichid_powerstate_how {
         IICHID_PS_NULL,
         IICHID_PS_ON,
         IICHID_PS_OFF,
 };
 
 /*
  * Locking: no internal locks are used. To serialize access to shared members,

 static int        iichid_setup_callout(struct iichid_softc *);
 static int        iichid_reset_callout(struct iichid_softc *);
 static void        iichid_teardown_callout(struct iichid_softc *);
 #endif
 
 static inline int
 acpi_is_iichid(ACPI_HANDLE handle)
 {
-        const struct iichid_id *ids;
         UINT32  sta;
-        int reg;
+        int i, reg = IICHID_REG_NONE;
 
-        for (ids = iichid_ids; ids->id != NULL; ids++) {
-                if (acpi_MatchHid(handle, ids->id)) {
-                        reg = ids->reg;
+    for (i = 0; i < nitems(iichid_ids); i++) {
+                if (acpi_MatchHid(handle, iichid_ids[i])) {
+                        reg = iichid_regs[i];
                         break;
                 }
         }
-        if (ids->id == NULL)
+        if (reg == IICHID_REG_NONE)
                 return (IICHID_REG_NONE);
 
         /*
          * If no _STA method or if it failed, then assume that
          * the device is present.
          */
         if (ACPI_FAILURE(acpi_GetInteger(handle, "_STA", &sta)) ||
             ACPI_DEVICE_PRESENT(sta))