stv0g/libnl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'declaration-fixes'

Browse source 
Assorted declaration fixes

http://lists.infradead.org/pipermail/libnl/2014-July/001570.html

Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2014-07-27 11:10:06 +02:00
commit 2605538632
14 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/netlink/cache.h
View file

@ -162,6 +162,8 @@ extern void nl_cache_mngr_free(struct nl_cache_mngr *);
extern void nl_cache_ops_get(struct nl_cache_ops *);
extern void nl_cache_ops_put(struct nl_cache_ops *);
extern void nl_cache_ops_set_flags(struct nl_cache_ops *,
unsigned int);
#ifdef __cplusplus
}

1
include/netlink/route/action.h
View file

@ -27,6 +27,7 @@ extern void rtnl_act_put(struct rtnl_act *);
extern int rtnl_act_build_add_request(struct rtnl_act *, int,
struct nl_msg **);
extern int rtnl_act_add(struct nl_sock *, struct rtnl_act *, int);
extern int rtnl_act_change(struct nl_sock *, struct rtnl_act *, int);
extern int rtnl_act_build_change_request(struct rtnl_act *, int,
struct nl_msg **);

2
include/netlink/route/link/ip6tnl.h
View file

@ -22,6 +22,8 @@ extern "C" {
extern struct rtnl_link *rtnl_link_ip6_tnl_alloc(void);
extern int rtnl_link_ip6_tnl_add(struct nl_sock *sk, const char *name);
extern int rtnl_link_is_ip6_tnl(struct rtnl_link *link);
extern int rtnl_link_ip6_tnl_set_link(struct rtnl_link *link, uint32_t index);
extern uint32_t rtnl_link_ip6_tnl_get_link(struct rtnl_link *link);

1
include/netlink/route/neightbl.h
View file

@ -41,6 +41,7 @@ extern void rtnl_neightbl_set_family(struct rtnl_neightbl *, int);
extern void rtnl_neightbl_set_gc_tresh1(struct rtnl_neightbl *, int);
extern void rtnl_neightbl_set_gc_tresh2(struct rtnl_neightbl *, int);
extern void rtnl_neightbl_set_gc_tresh3(struct rtnl_neightbl *, int);
extern void rtnl_neightbl_set_gc_interval(struct rtnl_neightbl *, uint64_t);
extern void rtnl_neightbl_set_name(struct rtnl_neightbl *, const char *);
extern void rtnl_neightbl_set_dev(struct rtnl_neightbl *, int);
extern void rtnl_neightbl_set_queue_len(struct rtnl_neightbl *, int);

1
include/netlink/route/qdisc/htb.h
View file

@ -40,6 +40,7 @@ extern uint32_t rtnl_htb_get_cbuffer(struct rtnl_class *);
extern int rtnl_htb_set_cbuffer(struct rtnl_class *, uint32_t);
extern uint32_t rtnl_htb_get_quantum(struct rtnl_class *);
extern int rtnl_htb_set_quantum(struct rtnl_class *, uint32_t);
extern int rtnl_htb_set_level(struct rtnl_class *, int);
extern int rtnl_htb_get_level(struct rtnl_class *);
#ifdef __cplusplus

2
lib/cache_mngt.c
View file

@ -38,7 +38,7 @@ static NL_RW_LOCK(cache_ops_lock);
* @{
*/
struct nl_cache_ops *__nl_cache_ops_lookup(const char *name)
static struct nl_cache_ops *__nl_cache_ops_lookup(const char *name)
{
struct nl_cache_ops *ops;

1
lib/route/act.c
View file

@ -21,6 +21,7 @@
#include <netlink/utils.h>
#include <netlink-private/route/tc-api.h>
#include <netlink/route/link.h>
#include <netlink/route/action.h>
static struct nl_object_ops act_obj_ops;

1
lib/route/cls/ematch/cmp.c
View file

@ -20,6 +20,7 @@
#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/route/cls/ematch.h>
#include <netlink/route/cls/ematch/cmp.h>
#include <linux/tc_ematch/tc_em_cmp.h>
void rtnl_ematch_cmp_set(struct rtnl_ematch *e, struct tcf_em_cmp *cfg)

1
lib/route/link/bonding.c
View file

@ -22,6 +22,7 @@
#include <netlink-private/netlink.h>
#include <netlink/netlink.h>
#include <netlink/route/link/bonding.h>
#include <netlink-private/route/link/api.h>
/**

1
lib/route/link/inet.c
View file

@ -61,6 +61,7 @@
#include <netlink/netlink.h>
#include <netlink/attr.h>
#include <netlink/route/rtnl.h>
#include <netlink/route/link/inet.h>
#include <netlink-private/route/link/api.h>
/** @cond SKIP */

1
lib/route/link/ip6tnl.c
View file

@ -28,6 +28,7 @@
#include <netlink/utils.h>
#include <netlink/object.h>
#include <netlink/route/rtnl.h>
#include <netlink/route/link/ip6tnl.h>
#include <netlink-private/route/link/api.h>
#include <linux/if_tunnel.h>
#include <netinet/in.h>

1
lib/route/link/ipgre.c
View file

@ -28,6 +28,7 @@
#include <netlink/utils.h>
#include <netlink/object.h>
#include <netlink/route/rtnl.h>
#include <netlink/route/link/ipgre.h>
#include <netlink-private/route/link/api.h>
#include <linux/if_tunnel.h>

1
lib/route/link/sit.c
View file

@ -28,6 +28,7 @@
#include <netlink/utils.h>
#include <netlink/object.h>
#include <netlink/route/rtnl.h>
#include <netlink/route/link/sit.h>
#include <netlink-private/route/link/api.h>
#include <linux/if_tunnel.h>

2
lib/socket.c
View file

@ -190,7 +190,7 @@ static struct nl_sock *__alloc_socket(struct nl_cb *cb)
sk->s_cb = nl_cb_get(cb);
sk->s_local.nl_family = AF_NETLINK;
sk->s_peer.nl_family = AF_NETLINK;
sk->s_seq_expect = sk->s_seq_next = time(0);
sk->s_seq_expect = sk->s_seq_next = time(NULL);
/* the port is 0 (unspecified), meaning NL_OWN_PORT */
sk->s_flags = NL_OWN_PORT;