lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tipc: Improve handling of media address printing errors

Browse Source 
Enhances conversion of a media address to printable form so that an
unconvertable address will be displayed as a string of hex digits,
rather than not being displayed at all. (Also removes a pointless check
for the existence of the media-specific address conversion routine,
since the routine is not optional.)

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
This commit is contained in:
Allan Stephens
2011-10-07 11:31:49 -04:00
committed by Paul Gortmaker
parent 6c34921010
commit c61b666e26
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
net/tipc/bearer.c
View File

@@ -136,20 +136,18 @@ exit:
void tipc_media_addr_printf(struct print_buf *pb, struct tipc_media_addr *a) void tipc_media_addr_printf(struct print_buf *pb, struct tipc_media_addr *a)
{ {
char addr_str[MAX_ADDR_STR];
struct media *m_ptr; struct media *m_ptr;
u32 media_type; u32 media_type;
u32 i;
media_type = ntohl(a->type); media_type = ntohl(a->type);
m_ptr = media_find_id(media_type); m_ptr = media_find_id(media_type);
if (m_ptr && (m_ptr->addr2str != NULL)) { if (m_ptr && !m_ptr->addr2str(a, addr_str, sizeof(addr_str)))
char addr_str[MAX_ADDR_STR]; tipc_printf(pb, "%s(%s)", m_ptr->name, addr_str);
else {
tipc_printf(pb, "%s(%s)", m_ptr->name,
m_ptr->addr2str(a, addr_str, sizeof(addr_str)));
} else {
unchar *addr = (unchar *)&a->dev_addr; unchar *addr = (unchar *)&a->dev_addr;
u32 i;
tipc_printf(pb, "UNKNOWN(%u)", media_type); tipc_printf(pb, "UNKNOWN(%u)", media_type);
for (i = 0; i < (sizeof(*a) - sizeof(a->type)); i++) for (i = 0; i < (sizeof(*a) - sizeof(a->type)); i++)

3
net/tipc/bearer.h
View File

@@ -83,8 +83,7 @@ struct media {
struct tipc_media_addr *dest); struct tipc_media_addr *dest);
int (*enable_bearer)(struct tipc_bearer *b_ptr); int (*enable_bearer)(struct tipc_bearer *b_ptr);
void (*disable_bearer)(struct tipc_bearer *b_ptr); void (*disable_bearer)(struct tipc_bearer *b_ptr);
char *(*addr2str)(struct tipc_media_addr *a, int (*addr2str)(struct tipc_media_addr *a, char *str_buf, int str_size);
char *str_buf, int str_size);
struct tipc_media_addr bcast_addr; struct tipc_media_addr bcast_addr;
u32 priority; u32 priority;
u32 tolerance; u32 tolerance;

12
net/tipc/eth_media.c
View File

@@ -243,15 +243,15 @@ static int recv_notification(struct notifier_block *nb, unsigned long evt,
* eth_addr2str - convert Ethernet address to string * eth_addr2str - convert Ethernet address to string
*/ */
static char *eth_addr2str(struct tipc_media_addr *a, char *str_buf, int str_size) static int eth_addr2str(struct tipc_media_addr *a, char *str_buf, int str_size)
{ {
unchar *addr = (unchar *)&a->dev_addr; unchar *addr = (unchar *)&a->dev_addr;
if (str_size < 18) if (str_size < 18) /* 18 = strlen("aa:bb:cc:dd:ee:ff\0") */
*str_buf = '\0'; return 1;
else
sprintf(str_buf, "%pM", addr); sprintf(str_buf, "%pM", addr);
return str_buf; return 0;
} }
/* /*