From 6dfd030442a111b749f96a4f7c9ba486fb910ec7 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 22 Jan 2010 15:13:26 -0800 Subject: [PATCH] netdev: Rename "class" members to "netdev_class" for C++ compatibility. From partner. --- lib/netdev-provider.h | 20 +++++--- lib/netdev.c | 115 ++++++++++++++++++++++-------------------- 2 files changed, 74 insertions(+), 61 deletions(-) diff --git a/lib/netdev-provider.h b/lib/netdev-provider.h index 64d227e8..07141db7 100644 --- a/lib/netdev-provider.h +++ b/lib/netdev-provider.h @@ -24,13 +24,17 @@ #include "list.h" #include "shash.h" +#ifdef __cplusplus +extern "C" { +#endif + /* A network device object that was created through the netdev_create() * call. * * This structure should be treated as opaque by network device * implementations. */ struct netdev_obj { - const struct netdev_class *class; + const struct netdev_class *netdev_class; int ref_cnt; bool created; /* Was netdev_create() called? */ }; @@ -38,9 +42,9 @@ struct netdev_obj { void netdev_obj_init(struct netdev_obj *, const char *name, const struct netdev_class *, bool created); static inline void netdev_obj_assert_class(const struct netdev_obj *netdev_obj, - const struct netdev_class *class) + const struct netdev_class *class_) { - assert(netdev_obj->class == class); + assert(netdev_obj->netdev_class == class_); } /* A network device (e.g. an Ethernet device). @@ -48,7 +52,7 @@ static inline void netdev_obj_assert_class(const struct netdev_obj *netdev_obj, * This structure should be treated as opaque by network device * implementations. */ struct netdev { - const struct netdev_class *class; + const struct netdev_class *netdev_class; char *name; /* e.g. "eth0" */ enum netdev_flags save_flags; /* Initial device flags. */ @@ -59,9 +63,9 @@ struct netdev { void netdev_init(struct netdev *, const char *name, const struct netdev_class *); static inline void netdev_assert_class(const struct netdev *netdev, - const struct netdev_class *class) + const struct netdev_class *netdev_class) { - assert(netdev->class == class); + assert(netdev->netdev_class == netdev_class); } const char *netdev_get_type(const struct netdev *netdev); @@ -350,4 +354,8 @@ struct netdev_class { extern const struct netdev_class netdev_linux_class; extern const struct netdev_class netdev_tap_class; +#ifdef __cplusplus +} +#endif + #endif /* netdev.h */ diff --git a/lib/netdev.c b/lib/netdev.c index fb0f98e6..f5089c1d 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -185,7 +185,7 @@ netdev_destroy(const char *name) } shash_delete(&netdev_obj_shash, node); - netdev_obj->class->destroy(netdev_obj); + netdev_obj->netdev_class->destroy(netdev_obj); return 0; } @@ -207,8 +207,8 @@ netdev_reconfigure(const char *name, const struct shash *args) return ENODEV; } - if (netdev_obj->class->reconfigure) { - return netdev_obj->class->reconfigure(netdev_obj, args); + if (netdev_obj->netdev_class->reconfigure) { + return netdev_obj->netdev_class->reconfigure(netdev_obj, args); } return 0; @@ -234,7 +234,7 @@ netdev_open(const char *name, int ethertype, struct netdev **netdevp) netdev_obj = shash_find_data(&netdev_obj_shash, name); if (netdev_obj) { - error = netdev_obj->class->open(name, ethertype, &netdev); + error = netdev_obj->netdev_class->open(name, ethertype, &netdev); } else { /* Default to "system". */ error = EAFNOSUPPORT; @@ -297,7 +297,7 @@ netdev_close(struct netdev *netdev) } /* Free. */ - netdev->class->close(netdev); + netdev->netdev_class->close(netdev); free(name); } } @@ -371,8 +371,8 @@ netdev_recv(struct netdev *netdev, struct ofpbuf *buffer) assert(buffer->size == 0); assert(ofpbuf_tailroom(buffer) >= ETH_TOTAL_MIN); - retval = netdev->class->recv(netdev, - buffer->data, ofpbuf_tailroom(buffer)); + retval = netdev->netdev_class->recv(netdev, + buffer->data, ofpbuf_tailroom(buffer)); if (retval >= 0) { COVERAGE_INC(netdev_received); buffer->size += retval; @@ -390,14 +390,14 @@ netdev_recv(struct netdev *netdev, struct ofpbuf *buffer) void netdev_recv_wait(struct netdev *netdev) { - netdev->class->recv_wait(netdev); + netdev->netdev_class->recv_wait(netdev); } /* Discards all packets waiting to be received from 'netdev'. */ int netdev_drain(struct netdev *netdev) { - return netdev->class->drain(netdev); + return netdev->netdev_class->drain(netdev); } /* Sends 'buffer' on 'netdev'. Returns 0 if successful, otherwise a positive @@ -412,7 +412,7 @@ netdev_drain(struct netdev *netdev) int netdev_send(struct netdev *netdev, const struct ofpbuf *buffer) { - int error = netdev->class->send(netdev, buffer->data, buffer->size); + int error = netdev->netdev_class->send(netdev, buffer->data, buffer->size); if (!error) { COVERAGE_INC(netdev_sent); } @@ -429,7 +429,7 @@ netdev_send(struct netdev *netdev, const struct ofpbuf *buffer) void netdev_send_wait(struct netdev *netdev) { - return netdev->class->send_wait(netdev); + return netdev->netdev_class->send_wait(netdev); } /* Attempts to set 'netdev''s MAC address to 'mac'. Returns 0 if successful, @@ -437,7 +437,7 @@ netdev_send_wait(struct netdev *netdev) int netdev_set_etheraddr(struct netdev *netdev, const uint8_t mac[ETH_ADDR_LEN]) { - return netdev->class->set_etheraddr(netdev, mac); + return netdev->netdev_class->set_etheraddr(netdev, mac); } /* Retrieves 'netdev''s MAC address. If successful, returns 0 and copies the @@ -446,7 +446,7 @@ netdev_set_etheraddr(struct netdev *netdev, const uint8_t mac[ETH_ADDR_LEN]) int netdev_get_etheraddr(const struct netdev *netdev, uint8_t mac[ETH_ADDR_LEN]) { - return netdev->class->get_etheraddr(netdev, mac); + return netdev->netdev_class->get_etheraddr(netdev, mac); } /* Returns the name of the network device that 'netdev' represents, @@ -467,7 +467,7 @@ netdev_get_name(const struct netdev *netdev) int netdev_get_mtu(const struct netdev *netdev, int *mtup) { - int error = netdev->class->get_mtu(netdev, mtup); + int error = netdev->netdev_class->get_mtu(netdev, mtup); if (error) { VLOG_WARN_RL(&rl, "failed to retrieve MTU for network device %s: %s", netdev_get_name(netdev), strerror(error)); @@ -488,7 +488,7 @@ netdev_get_mtu(const struct netdev *netdev, int *mtup) int netdev_get_ifindex(const struct netdev *netdev) { - return netdev->class->get_ifindex(netdev); + return netdev->netdev_class->get_ifindex(netdev); } /* Stores the features supported by 'netdev' into each of '*current', @@ -517,8 +517,8 @@ netdev_get_features(struct netdev *netdev, peer = &dummy[3]; } - error = netdev->class->get_features(netdev, current, advertised, supported, - peer); + error = netdev->netdev_class->get_features(netdev, current, advertised, + supported, peer); if (error) { *current = *advertised = *supported = *peer = 0; } @@ -530,8 +530,8 @@ netdev_get_features(struct netdev *netdev, int netdev_set_advertisements(struct netdev *netdev, uint32_t advertise) { - return (netdev->class->set_advertisements - ? netdev->class->set_advertisements(netdev, advertise) + return (netdev->netdev_class->set_advertisements + ? netdev->netdev_class->set_advertisements(netdev, advertise) : EOPNOTSUPP); } @@ -555,8 +555,8 @@ netdev_get_in4(const struct netdev *netdev, struct in_addr netmask; int error; - error = (netdev->class->get_in4 - ? netdev->class->get_in4(netdev, &address, &netmask) + error = (netdev->netdev_class->get_in4 + ? netdev->netdev_class->get_in4(netdev, &address, &netmask) : EOPNOTSUPP); if (address_) { address_->s_addr = error ? 0 : address.s_addr; @@ -573,8 +573,8 @@ netdev_get_in4(const struct netdev *netdev, int netdev_set_in4(struct netdev *netdev, struct in_addr addr, struct in_addr mask) { - return (netdev->class->set_in4 - ? netdev->class->set_in4(netdev, addr, mask) + return (netdev->netdev_class->set_in4 + ? netdev->netdev_class->set_in4(netdev, addr, mask) : EOPNOTSUPP); } @@ -584,8 +584,8 @@ int netdev_add_router(struct netdev *netdev, struct in_addr router) { COVERAGE_INC(netdev_add_router); - return (netdev->class->add_router - ? netdev->class->add_router(netdev, router) + return (netdev->netdev_class->add_router + ? netdev->netdev_class->add_router(netdev, router) : EOPNOTSUPP); } @@ -601,8 +601,9 @@ netdev_get_next_hop(const struct netdev *netdev, const struct in_addr *host, struct in_addr *next_hop, char **netdev_name) { - int error = (netdev->class->get_next_hop - ? netdev->class->get_next_hop(host, next_hop, netdev_name) + int error = (netdev->netdev_class->get_next_hop + ? netdev->netdev_class->get_next_hop(host, next_hop, + netdev_name) : EOPNOTSUPP); if (error) { next_hop->s_addr = 0; @@ -628,8 +629,8 @@ netdev_get_in6(const struct netdev *netdev, struct in6_addr *in6) struct in6_addr dummy; int error; - error = (netdev->class->get_in6 - ? netdev->class->get_in6(netdev, in6 ? in6 : &dummy) + error = (netdev->netdev_class->get_in6 + ? netdev->netdev_class->get_in6(netdev, in6 ? in6 : &dummy) : EOPNOTSUPP); if (error && in6) { memset(in6, 0, sizeof *in6); @@ -649,7 +650,8 @@ do_update_flags(struct netdev *netdev, enum netdev_flags off, enum netdev_flags old_flags; int error; - error = netdev->class->update_flags(netdev, off & ~on, on, &old_flags); + error = netdev->netdev_class->update_flags(netdev, off & ~on, + on, &old_flags); if (error) { VLOG_WARN_RL(&rl, "failed to %s flags for network device %s: %s", off || on ? "set" : "get", netdev_get_name(netdev), @@ -722,8 +724,8 @@ int netdev_arp_lookup(const struct netdev *netdev, uint32_t ip, uint8_t mac[ETH_ADDR_LEN]) { - int error = (netdev->class->arp_lookup - ? netdev->class->arp_lookup(netdev, ip, mac) + int error = (netdev->netdev_class->arp_lookup + ? netdev->netdev_class->arp_lookup(netdev, ip, mac) : EOPNOTSUPP); if (error) { memset(mac, 0, ETH_ADDR_LEN); @@ -736,8 +738,8 @@ netdev_arp_lookup(const struct netdev *netdev, int netdev_get_carrier(const struct netdev *netdev, bool *carrier) { - int error = (netdev->class->get_carrier - ? netdev->class->get_carrier(netdev, carrier) + int error = (netdev->netdev_class->get_carrier + ? netdev->netdev_class->get_carrier(netdev, carrier) : EOPNOTSUPP); if (error) { *carrier = false; @@ -752,8 +754,8 @@ netdev_get_stats(const struct netdev *netdev, struct netdev_stats *stats) int error; COVERAGE_INC(netdev_get_stats); - error = (netdev->class->get_stats - ? netdev->class->get_stats(netdev, stats) + error = (netdev->netdev_class->get_stats + ? netdev->netdev_class->get_stats(netdev, stats) : EOPNOTSUPP); if (error) { memset(stats, 0xff, sizeof *stats); @@ -768,8 +770,9 @@ int netdev_set_policing(struct netdev *netdev, uint32_t kbits_rate, uint32_t kbits_burst) { - return (netdev->class->set_policing - ? netdev->class->set_policing(netdev, kbits_rate, kbits_burst) + return (netdev->netdev_class->set_policing + ? netdev->netdev_class->set_policing(netdev, + kbits_rate, kbits_burst) : EOPNOTSUPP); } @@ -781,8 +784,8 @@ netdev_set_policing(struct netdev *netdev, uint32_t kbits_rate, int netdev_get_vlan_vid(const struct netdev *netdev, int *vlan_vid) { - int error = (netdev->class->get_vlan_vid - ? netdev->class->get_vlan_vid(netdev, vlan_vid) + int error = (netdev->netdev_class->get_vlan_vid + ? netdev->netdev_class->get_vlan_vid(netdev, vlan_vid) : ENOENT); if (error) { *vlan_vid = 0; @@ -819,32 +822,33 @@ exit: } /* Initializes 'netdev_obj' as a netdev object named 'name' of the - * specified 'class'. + * specified 'netdev_class'. * * This function adds 'netdev_obj' to a netdev-owned shash, so it is * very important that 'netdev_obj' only be freed after calling * netdev_destroy(). */ void netdev_obj_init(struct netdev_obj *netdev_obj, const char *name, - const struct netdev_class *class, bool created) + const struct netdev_class *netdev_class, bool created) { assert(!shash_find(&netdev_obj_shash, name)); - netdev_obj->class = class; + netdev_obj->netdev_class = netdev_class; netdev_obj->ref_cnt = 0; netdev_obj->created = created; shash_add(&netdev_obj_shash, name, netdev_obj); } -/* Initializes 'netdev' as a netdev named 'name' of the specified 'class'. +/* Initializes 'netdev' as a netdev named 'name' of the specified + * 'netdev_class'. * * This function adds 'netdev' to a netdev-owned linked list, so it is very * important that 'netdev' only be freed after calling netdev_close(). */ void netdev_init(struct netdev *netdev, const char *name, - const struct netdev_class *class) + const struct netdev_class *netdev_class) { - netdev->class = class; + netdev->netdev_class = netdev_class; netdev->name = xstrdup(name); netdev->save_flags = 0; netdev->changed_flags = 0; @@ -856,7 +860,7 @@ netdev_init(struct netdev *netdev, const char *name, * The caller must not free the returned value. */ const char *netdev_get_type(const struct netdev *netdev) { - return netdev->class->type; + return netdev->netdev_class->type; } /* Initializes 'notifier' as a netdev notifier for 'netdev', for which @@ -896,7 +900,7 @@ netdev_monitor_destroy(struct netdev_monitor *monitor) SHASH_FOR_EACH (node, &monitor->polled_netdevs) { struct netdev_notifier *notifier = node->data; - notifier->netdev->class->poll_remove(notifier); + notifier->netdev->netdev_class->poll_remove(notifier); } shash_destroy(&monitor->polled_netdevs); @@ -926,11 +930,11 @@ netdev_monitor_add(struct netdev_monitor *monitor, struct netdev *netdev) const char *netdev_name = netdev_get_name(netdev); int error = 0; if (!shash_find(&monitor->polled_netdevs, netdev_name) - && netdev->class->poll_add) + && netdev->netdev_class->poll_add) { struct netdev_notifier *notifier; - error = netdev->class->poll_add(netdev, netdev_monitor_cb, monitor, - ¬ifier); + error = netdev->netdev_class->poll_add(netdev, netdev_monitor_cb, + monitor, ¬ifier); if (!error) { assert(notifier->netdev == netdev); shash_add(&monitor->polled_netdevs, netdev_name, notifier); @@ -952,7 +956,7 @@ netdev_monitor_remove(struct netdev_monitor *monitor, struct netdev *netdev) if (node) { /* Cancel future notifications. */ struct netdev_notifier *notifier = node->data; - netdev->class->poll_remove(notifier); + netdev->netdev_class->poll_remove(notifier); shash_delete(&monitor->polled_netdevs, node); /* Drop any pending notification. */ @@ -1010,9 +1014,10 @@ restore_flags(struct netdev *netdev) if (netdev->changed_flags) { enum netdev_flags restore = netdev->save_flags & netdev->changed_flags; enum netdev_flags old_flags; - return netdev->class->update_flags(netdev, - netdev->changed_flags & ~restore, - restore, &old_flags); + return netdev->netdev_class->update_flags(netdev, + netdev->changed_flags + & ~restore, + restore, &old_flags); } return 0; } -- 2.30.2