clones/mtr
1
0
Fork 0
mirror of https://github.com/traviscross/mtr.git synced 2024-09-21 10:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

unify codestyle

Browse Source
This commit is contained in:
a1346054 2021-09-05 13:50:56 +00:00
parent 2e837dee7c
commit 1d80fd0f1d
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packet/deconstruct_unix.c
View File

@ -99,22 +99,22 @@ void handle_inner_udp_packet(
{
saddr = &((struct IPHeader *)ip)->saddr;
daddr = &((struct IPHeader *)ip)->daddr;
}else
} else
if (af == AF_INET6)
{
daddr = &((struct IP6Header *)ip)->daddr;
saddr = &((struct IP6Header *)ip)->saddr;
}else
} else
{
return;
}
if( memcmp(sockaddr_addr_offset(&probe->remote_addr),
if ( memcmp(sockaddr_addr_offset(&probe->remote_addr),
daddr,
sockaddr_addr_size(&probe->remote_addr)) != 0 )
return;
if( memcmp(sockaddr_addr_offset(&probe->local_addr),
if ( memcmp(sockaddr_addr_offset(&probe->local_addr),
saddr,
sockaddr_addr_size(&probe->local_addr)) != 0)
return;

32
packet/sockaddr.c
View File

@ -5,14 +5,14 @@
void *sockaddr_addr_offset(const void *x)
{
if( x == NULL )
if ( x == NULL )
return NULL;
if( ((struct sockaddr *)(x))->sa_family == AF_INET )
if ( ((struct sockaddr *)(x))->sa_family == AF_INET )
{
return ((void *)(x) + offsetof(struct sockaddr_in, sin_addr));
}else
if( ((struct sockaddr *)(x))->sa_family == AF_INET6 )
} else
if ( ((struct sockaddr *)(x))->sa_family == AF_INET6 )
{
return ((void *)(x) + offsetof(struct sockaddr_in6, sin6_addr));
}
@ -22,13 +22,13 @@ void *sockaddr_addr_offset(const void *x)
unsigned int sockaddr_addr_size(const void *x)
{
if( x == NULL )
if ( x == NULL )
return 0;
if( ((struct sockaddr *)(x))->sa_family == AF_INET )
if ( ((struct sockaddr *)(x))->sa_family == AF_INET )
{
return sizeof(struct in_addr);
}else
if( ((struct sockaddr *)(x))->sa_family == AF_INET6 )
} else
if ( ((struct sockaddr *)(x))->sa_family == AF_INET6 )
{
return sizeof(struct in6_addr);
}
@ -38,13 +38,13 @@ unsigned int sockaddr_addr_size(const void *x)
unsigned int sockaddr_size(const void *x)
{
if( x == NULL )
if ( x == NULL )
return 0;
if( ((struct sockaddr *)(x))->sa_family == AF_INET )
if ( ((struct sockaddr *)(x))->sa_family == AF_INET )
{
return sizeof(struct sockaddr_in);
}else
if( ((struct sockaddr *)(x))->sa_family == AF_INET6 )
} else
if ( ((struct sockaddr *)(x))->sa_family == AF_INET6 )
{
return sizeof(struct sockaddr_in6);
}
@ -53,14 +53,14 @@ unsigned int sockaddr_size(const void *x)
in_port_t *sockaddr_port_offset(const void *x)
{
if( x == NULL )
if ( x == NULL )
return NULL;
if( ((struct sockaddr *)(x))->sa_family == AF_INET )
if ( ((struct sockaddr *)(x))->sa_family == AF_INET )
{
return ((void *)(x) + offsetof(struct sockaddr_in, sin_port));
}else
if( ((struct sockaddr *)(x))->sa_family == AF_INET6 )
} else
if ( ((struct sockaddr *)(x))->sa_family == AF_INET6 )
{
return ((void *)(x) + offsetof(struct sockaddr_in6, sin6_port));
}

2
portability/queue.h
View File

@ -305,7 +305,7 @@ struct { \
#define STAILQ_FIRST(head) ((head)->stqh_first)
#define STAILQ_FOREACH(var, head, field) \
for((var) = STAILQ_FIRST((head)); \
for ((var) = STAILQ_FIRST((head)); \
(var); \
(var) = STAILQ_NEXT((var), field))

2
ui/net.c
View File

@ -600,7 +600,7 @@ int net_send_batch(
numhosts = batch_at + 1;
}
if(restart) {
if (restart) {
batch_at = ctl->fstTTL - 1;
return 1;
}

2
ui/report.c
View File

@ -344,7 +344,7 @@ void json_close(struct mtr_ctl *ctl)
goto on_error;
#ifdef HAVE_IPINFO
if(!ctl->ipinfo_no) {
if (!ctl->ipinfo_no) {
char* fmtinfo = fmt_ipinfo(ctl, addr);
if (fmtinfo != NULL)
fmtinfo = trim(fmtinfo, '\0');