tipc: Improve handling of media address printing errors
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:
parent
6c34921010
commit
c61b666e26
|
@ -136,20 +136,18 @@ exit:
|
|||
|
||||
void tipc_media_addr_printf(struct print_buf *pb, struct tipc_media_addr *a)
|
||||
{
|
||||
char addr_str[MAX_ADDR_STR];
|
||||
struct media *m_ptr;
|
||||
u32 media_type;
|
||||
u32 i;
|
||||
|
||||
media_type = ntohl(a->type);
|
||||
m_ptr = media_find_id(media_type);
|
||||
|
||||
if (m_ptr && (m_ptr->addr2str != NULL)) {
|
||||
char addr_str[MAX_ADDR_STR];
|
||||
|
||||
tipc_printf(pb, "%s(%s)", m_ptr->name,
|
||||
m_ptr->addr2str(a, addr_str, sizeof(addr_str)));
|
||||
} else {
|
||||
if (m_ptr && !m_ptr->addr2str(a, addr_str, sizeof(addr_str)))
|
||||
tipc_printf(pb, "%s(%s)", m_ptr->name, addr_str);
|
||||
else {
|
||||
unchar *addr = (unchar *)&a->dev_addr;
|
||||
u32 i;
|
||||
|
||||
tipc_printf(pb, "UNKNOWN(%u)", media_type);
|
||||
for (i = 0; i < (sizeof(*a) - sizeof(a->type)); i++)
|
||||
|
|
|
@ -83,8 +83,7 @@ struct media {
|
|||
struct tipc_media_addr *dest);
|
||||
int (*enable_bearer)(struct tipc_bearer *b_ptr);
|
||||
void (*disable_bearer)(struct tipc_bearer *b_ptr);
|
||||
char *(*addr2str)(struct tipc_media_addr *a,
|
||||
char *str_buf, int str_size);
|
||||
int (*addr2str)(struct tipc_media_addr *a, char *str_buf, int str_size);
|
||||
struct tipc_media_addr bcast_addr;
|
||||
u32 priority;
|
||||
u32 tolerance;
|
||||
|
|
|
@ -243,15 +243,15 @@ static int recv_notification(struct notifier_block *nb, unsigned long evt,
|
|||
* 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;
|
||||
|
||||
if (str_size < 18)
|
||||
*str_buf = '\0';
|
||||
else
|
||||
sprintf(str_buf, "%pM", addr);
|
||||
return str_buf;
|
||||
if (str_size < 18) /* 18 = strlen("aa:bb:cc:dd:ee:ff\0") */
|
||||
return 1;
|
||||
|
||||
sprintf(str_buf, "%pM", addr);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue