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

idiag: deprecate IDIAG_TIMER_* value for IDIAGNL_TIMER_*

Browse source 
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2014-11-24 17:14:51 +01:00
parent 94039ca48a
commit 6bf68e60e4
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
include/netlink/idiag/idiagnl.h
View file

@ -101,17 +101,25 @@ enum {
#define IDIAG_SK_MEMINFO_BACKLOG SK_MEMINFO_BACKLOG
#define IDIAG_SK_MEMINFO_VARS SK_MEMINFO_VARS
/* deprecated names. */
#define IDIAG_TIMER_OFF IDIAGNL_TIMER_OFF
#define IDIAG_TIMER_ON IDIAGNL_TIMER_ON
#define IDIAG_TIMER_KEEPALIVE IDIAGNL_TIMER_KEEPALIVE
#define IDIAG_TIMER_TIMEWAIT IDIAGNL_TIMER_TIMEWAIT
#define IDIAG_TIMER_PERSIST IDIAGNL_TIMER_PERSIST
#define IDIAG_TIMER_UNKNOWN IDIAGNL_TIMER_UNKNOWN
/**
* Socket timer indentifiers
* @ingroupd idiag
*/
enum {
IDIAG_TIMER_OFF,
IDIAG_TIMER_ON,
IDIAG_TIMER_KEEPALIVE,
IDIAG_TIMER_TIMEWAIT,
IDIAG_TIMER_PERSIST,
IDIAG_TIMER_UNKNOWN,
IDIAGNL_TIMER_OFF = 0,
IDIAGNL_TIMER_ON = 1,
IDIAGNL_TIMER_KEEPALIVE = 2,
IDIAGNL_TIMER_TIMEWAIT = 3,
IDIAGNL_TIMER_PERSIST = 4,
IDIAGNL_TIMER_UNKNOWN = 5,
};
extern char * idiagnl_state2str(int, char *, size_t);

14
lib/idiag/idiag.c
View file

@ -123,17 +123,17 @@ int idiagnl_str2state(const char *name)
}
static const struct trans_tbl idiag_timers[] = {
__ADD(IDIAG_TIMER_OFF, off),
__ADD(IDIAG_TIMER_ON, on),
__ADD(IDIAG_TIMER_KEEPALIVE, keepalive),
__ADD(IDIAG_TIMER_TIMEWAIT, timewait),
__ADD(IDIAG_TIMER_PERSIST, persist),
__ADD(IDIAG_TIMER_UNKNOWN, unknown),
__ADD(IDIAGNL_TIMER_OFF, off),
__ADD(IDIAGNL_TIMER_ON, on),
__ADD(IDIAGNL_TIMER_KEEPALIVE, keepalive),
__ADD(IDIAGNL_TIMER_TIMEWAIT, timewait),
__ADD(IDIAGNL_TIMER_PERSIST, persist),
__ADD(IDIAGNL_TIMER_UNKNOWN, unknown),
};
/**
* Convert inet diag timer types to strings.
* @arg timer inetdiag timer (e.g., IDIAG_TIMER_ON)
* @arg timer inetdiag timer (e.g., IDIAGNL_TIMER_ON)
* @arg buf output buffer which will hold string result
* @arg len length in bytes of the output buffer
*