[PATCH] Report actual mac address in ncf_if_xml_state.

[Laine Stump]

Iterate the NETLINK link cache to find the entry for each interface,
extract the mac address, and add it to the XML.
---
 src/dutil.c |   67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 66 insertions(+), 1 deletions(-)

diff --git a/src/dutil.c b/src/dutil.c
index 1fc6097..a010d27 100644
--- a/src/dutil.c
+++ b/src/dutil.c
@@ -610,6 +610,7 @@ struct nl_callback_data {
     xmlNodePtr root;
     xmlNodePtr protov4;
     xmlNodePtr protov6;
+    xmlNodePtr mac;
     struct netcf_if *nif;
 };
 
@@ -708,10 +709,60 @@ error:
     return;
 }
 
+static void _add_mac_cb(struct nl_object *obj, void *arg) {
+    struct nl_callback_data *cb_data = arg;
+    struct rtnl_link *iflink = (struct rtnl_link *)obj;
+    struct netcf *ncf = cb_data->nif->ncf;
+
+    struct nl_addr *addr;
+    char mac_str[64];
+    xmlNodePtr cur;
+    xmlAttrPtr prop = NULL;
+
+    if (cb_data->mac != NULL)
+        return;
+
+    addr = rtnl_link_get_addr(iflink);
+    if ((addr == NULL) || nl_addr_iszero(addr))
+        return;
+
+    nl_addr2str(addr, mac_str, sizeof(mac_str));
+
+    for (cur = cb_data->root->children; cur != NULL; cur = cur->next) {
+        if ((cur->type == XML_ELEMENT_NODE) &&
+            xmlStrEqual(cur->name, BAD_CAST "mac")) {
+            cb_data->mac = cur;
+            break;
+        }
+    }
+
+    if (cb_data->mac == NULL) {
+        /* No mac node exists in the document, create a new one.
+         */
+        cb_data->mac = xmlNewDocNode(cb_data->doc, NULL, BAD_CAST "mac",
NULL);
+        ERR_NOMEM(cb_data->mac == NULL, ncf);
+
+        cur = xmlAddChild(cb_data->root, cb_data->mac);
+        if (cur == NULL) {
+            xmlFreeNode(cb_data->mac);
+            cb_data->mac = NULL;
+            report_error(ncf, NETCF_ENOMEM, NULL);
+            goto error;
+        }
+    }
+
+    prop = xmlSetProp(cb_data->mac, BAD_CAST "address", BAD_CAST mac_str);
+    ERR_NOMEM(prop == NULL, ncf);
+
+error:
+    return;
+}
+
 void add_state_to_xml_doc(struct netcf_if *nif, xmlDocPtr doc) {
 
-    struct nl_callback_data cb_data = { doc, NULL, NULL, NULL, nif };
+    struct nl_callback_data cb_data = { doc, NULL, NULL, NULL, NULL, nif };
     struct rtnl_addr *filter_addr = NULL;
+    struct rtnl_link *filter_link = NULL;
     int ifindex, code;
 
     cb_data.root = xmlDocGetRootElement(doc);
@@ -735,6 +786,18 @@ void add_state_to_xml_doc(struct netcf_if *nif, xmlDocPtr doc) {
     ERR_THROW((ifindex == RTNL_LINK_NOT_FOUND), nif->ncf, ENETLINK,
               "Could find ifindex for interface `%s`", nif->name);
 
+    /* Build an rtnl_link with the interface index set, and use it to
+     * find the entry for this interface and extract the mac
+     * address.
+     */
+    filter_link = rtnl_link_alloc();
+    ERR_NOMEM((filter_link == NULL), nif->ncf);
+
+    rtnl_link_set_ifindex(filter_link, ifindex);
+    nl_cache_foreach_filter(nif->ncf->driver->link_cache,
+                            OBJ_CAST(filter_link), _add_mac_cb,
+                            &cb_data);
+
     /* Build an rtnl_addr with the interface name set. This is used by
      * the iterator to filter the contents of the address cache.
      */
@@ -749,6 +812,8 @@ void add_state_to_xml_doc(struct netcf_if *nif, xmlDocPtr doc) {
 error:
     if (filter_addr)
         rtnl_addr_put(filter_addr);
+    if (filter_link)
+        rtnl_link_put(filter_link);
     return;
 }
 
-- 
1.6.5.15.gc274d

[David Lutterkort]

On Fri, 2009-10-23 at 13:32 -0400, Laine Stump wrote:
>  Iterate the NETLINK link cache to find the entry for each interface,
>  extract the mac address, and add it to the XML. 
This doesn't apply for me, neither on top of the ncf_if_status patch,
nor on master. I get

        Applying: Report actual mac address in ncf_if_xml_state.
        error: patch failed: src/dutil.c:735
        error: src/dutil.c: patch does not apply
        Patch failed at 0001 Report actual mac address in
        ncf_if_xml_state.
        
>  ---
>   src/dutil.c |   67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
>   1 files changed, 66 insertions(+), 1 deletions(-)
>  
>  diff --git a/src/dutil.c b/src/dutil.c
>  index 1fc6097..a010d27 100644
>  --- a/src/dutil.c
>  +++ b/src/dutil.c 
>  @@ -708,10 +709,60 @@ error:
>       return;
>   }
>   
>  +static void _add_mac_cb(struct nl_object *obj, void *arg) { 
No need to start names with '_'. Just call it 'add_mac_cb'.

>  +    nl_addr2str(addr, mac_str, sizeof(mac_str)); 
Ugh .. no way to check that the buffer was big enough - I filed BZ
530969 for that.

David

[Laine Stump]

On 10/26/2009 06:36 AM, David Lutterkort wrote:
>  On Fri, 2009-10-23 at 13:32 -0400, Laine Stump wrote:
>     
> > Iterate the NETLINK link cache to find the entry for each interface,
> > extract the mac address, and add it to the XML.
> >      
>  This doesn't apply for me, neither on top of the ncf_if_status patch,
>  nor on master. I get
>
>           Applying: Report actual mac address in ncf_if_xml_state.
>           error: patch failed: src/dutil.c:735
>           error: src/dutil.c: patch does not apply
>           Patch failed at 0001 Report actual mac address in
>           ncf_if_xml_state.
>      
Ah, you're right. I had done some rearranging of the code in a separate 
commit just prior to this one, and forgot to include that in the patch 
series. If I'm quick I can resend before I have to leave for 1/2 an hour...

>     
> > ---
> >   src/dutil.c |   67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
> >   1 files changed, 66 insertions(+), 1 deletions(-)
> >
> > diff --git a/src/dutil.c b/src/dutil.c
> > index 1fc6097..a010d27 100644
> > --- a/src/dutil.c
> > +++ b/src/dutil.c
> > @@ -708,10 +709,60 @@ error:
> >       return;
> >   }
> >
> > +static void _add_mac_cb(struct nl_object *obj, void *arg) {
> >      
>  No need to start names with '_'. Just call it 'add_mac_cb'.
>      
Okay.

>     
> > +    nl_addr2str(addr, mac_str, sizeof(mac_str));
> >      
>  Ugh .. no way to check that the buffer was big enough - I filed BZ
>  530969 for that.
>      
Well, even though it may silently chop off something at the end, at 
least they let you specify the size of the buffer so you know you won't 
overflow. ;-)
>  David
>
>
>
>

[PATCH 0/3] redo mac address reporting

[Laine Stump]

This series includes the reorganization patch I forgot to include when
I originally submitted the patch, and also changes _add_mac_cb to
add_mac_cb. For good measure I also include a patch to rename
_add_ips_cb(), which slipped through an earlier review.

[PATCH 1/3] Reorganize for cleaner upcoming addition

[Laine Stump]

The next patch will add in code to get the interface's current mac address,
and some of the stuff already here is used for both IP and MAC address
filtering. Separate those lines from the address-filtering code to make
it more obvious.
---
 src/dutil.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/dutil.c b/src/dutil.c
index 24c422d..1fc6097 100644
--- a/src/dutil.c
+++ b/src/dutil.c
@@ -720,12 +720,7 @@ void add_state_to_xml_doc(struct netcf_if *nif, xmlDocPtr doc) {
     ERR_THROW(!xmlStrEqual(cb_data.root->name, BAD_CAST "interface"),
               nif->ncf, EINTERNAL, "root document is not an interface");
 
-    /* Build an rtnl_addr with the interface name set. This is used by
-     * the iterator to filter the contents of the address cache.
-     */
-    filter_addr = rtnl_addr_alloc();
-    ERR_NOMEM((filter_addr == NULL), nif->ncf);
-
+    /* Update the caches with any recent changes */
     code = nl_cache_refill(nif->ncf->driver->nl_sock,
                            nif->ncf->driver->link_cache);
     ERR_THROW((code < 0), nif->ncf, ENETLINK,
@@ -735,9 +730,17 @@ void add_state_to_xml_doc(struct netcf_if *nif, xmlDocPtr doc) {
     ERR_THROW((code < 0), nif->ncf, ENETLINK,
               "failed to refill interface address cache");
 
+    /* The addr cache only knows about ifindex, not name */
     ifindex = rtnl_link_name2i(nif->ncf->driver->link_cache, nif->name);
     ERR_THROW((ifindex == RTNL_LINK_NOT_FOUND), nif->ncf, ENETLINK,
               "Could find ifindex for interface `%s`", nif->name);
+
+    /* Build an rtnl_addr with the interface name set. This is used by
+     * the iterator to filter the contents of the address cache.
+     */
+    filter_addr = rtnl_addr_alloc();
+    ERR_NOMEM((filter_addr == NULL), nif->ncf);
+
     rtnl_addr_set_ifindex(filter_addr, ifindex);
 
     nl_cache_foreach_filter(nif->ncf->driver->addr_cache,
-- 
1.6.5.15.gc274d

[PATCH 2/3] Report actual mac address in ncf_if_xml_state.

[Laine Stump]

Iterate the NETLINK link cache to find the entry for each interface,
extract the mac address, and add it to the XML.
---
 src/dutil.c |   67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 66 insertions(+), 1 deletions(-)

diff --git a/src/dutil.c b/src/dutil.c
index 1fc6097..6a17332 100644
--- a/src/dutil.c
+++ b/src/dutil.c
@@ -610,6 +610,7 @@ struct nl_callback_data {
     xmlNodePtr root;
     xmlNodePtr protov4;
     xmlNodePtr protov6;
+    xmlNodePtr mac;
     struct netcf_if *nif;
 };
 
@@ -708,10 +709,60 @@ error:
     return;
 }
 
+static void add_mac_cb(struct nl_object *obj, void *arg) {
+    struct nl_callback_data *cb_data = arg;
+    struct rtnl_link *iflink = (struct rtnl_link *)obj;
+    struct netcf *ncf = cb_data->nif->ncf;
+
+    struct nl_addr *addr;
+    char mac_str[64];
+    xmlNodePtr cur;
+    xmlAttrPtr prop = NULL;
+
+    if (cb_data->mac != NULL)
+        return;
+
+    addr = rtnl_link_get_addr(iflink);
+    if ((addr == NULL) || nl_addr_iszero(addr))
+        return;
+
+    nl_addr2str(addr, mac_str, sizeof(mac_str));
+
+    for (cur = cb_data->root->children; cur != NULL; cur = cur->next) {
+        if ((cur->type == XML_ELEMENT_NODE) &&
+            xmlStrEqual(cur->name, BAD_CAST "mac")) {
+            cb_data->mac = cur;
+            break;
+        }
+    }
+
+    if (cb_data->mac == NULL) {
+        /* No mac node exists in the document, create a new one.
+         */
+        cb_data->mac = xmlNewDocNode(cb_data->doc, NULL, BAD_CAST "mac",
NULL);
+        ERR_NOMEM(cb_data->mac == NULL, ncf);
+
+        cur = xmlAddChild(cb_data->root, cb_data->mac);
+        if (cur == NULL) {
+            xmlFreeNode(cb_data->mac);
+            cb_data->mac = NULL;
+            report_error(ncf, NETCF_ENOMEM, NULL);
+            goto error;
+        }
+    }
+
+    prop = xmlSetProp(cb_data->mac, BAD_CAST "address", BAD_CAST mac_str);
+    ERR_NOMEM(prop == NULL, ncf);
+
+error:
+    return;
+}
+
 void add_state_to_xml_doc(struct netcf_if *nif, xmlDocPtr doc) {
 
-    struct nl_callback_data cb_data = { doc, NULL, NULL, NULL, nif };
+    struct nl_callback_data cb_data = { doc, NULL, NULL, NULL, NULL, nif };
     struct rtnl_addr *filter_addr = NULL;
+    struct rtnl_link *filter_link = NULL;
     int ifindex, code;
 
     cb_data.root = xmlDocGetRootElement(doc);
@@ -735,6 +786,18 @@ void add_state_to_xml_doc(struct netcf_if *nif, xmlDocPtr doc) {
     ERR_THROW((ifindex == RTNL_LINK_NOT_FOUND), nif->ncf, ENETLINK,
               "Could find ifindex for interface `%s`", nif->name);
 
+    /* Build an rtnl_link with the interface index set, and use it to
+     * find the entry for this interface and extract the mac
+     * address.
+     */
+    filter_link = rtnl_link_alloc();
+    ERR_NOMEM((filter_link == NULL), nif->ncf);
+
+    rtnl_link_set_ifindex(filter_link, ifindex);
+    nl_cache_foreach_filter(nif->ncf->driver->link_cache,
+                            OBJ_CAST(filter_link), add_mac_cb,
+                            &cb_data);
+
     /* Build an rtnl_addr with the interface name set. This is used by
      * the iterator to filter the contents of the address cache.
      */
@@ -749,6 +812,8 @@ void add_state_to_xml_doc(struct netcf_if *nif, xmlDocPtr doc) {
 error:
     if (filter_addr)
         rtnl_addr_put(filter_addr);
+    if (filter_link)
+        rtnl_link_put(filter_link);
     return;
 }
 
-- 
1.6.5.15.gc274d

[PATCH 3/3] Remove undesirable leading _ from static function name

[Laine Stump]

---
 src/dutil.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dutil.c b/src/dutil.c
index 6a17332..d4eea90 100644
--- a/src/dutil.c
+++ b/src/dutil.c
@@ -616,7 +616,7 @@ struct nl_callback_data {
 
 /* add all ip addresses for the given interface to the xml document
 */
-static void _add_ips_cb(struct nl_object *obj, void *arg) {
+static void add_ips_cb(struct nl_object *obj, void *arg) {
     struct nl_callback_data *cb_data = arg;
     struct rtnl_addr *addr = (struct rtnl_addr *)obj;
     struct netcf *ncf = cb_data->nif->ncf;
@@ -807,7 +807,7 @@ void add_state_to_xml_doc(struct netcf_if *nif, xmlDocPtr doc) {
     rtnl_addr_set_ifindex(filter_addr, ifindex);
 
     nl_cache_foreach_filter(nif->ncf->driver->addr_cache,
-                            OBJ_CAST(filter_addr), _add_ips_cb,
+                            OBJ_CAST(filter_addr), add_ips_cb,
                             &cb_data);
 error:
     if (filter_addr)
-- 
1.6.5.15.gc274d