Skip to content

Commit

Permalink
xmpp: clang-format for coherent indentation and coding style
Browse files Browse the repository at this point in the history
  • Loading branch information
linuxmaniac committed May 18, 2023
1 parent 0704478 commit 709163f
Show file tree
Hide file tree
Showing 17 changed files with 2,585 additions and 2,629 deletions.
68 changes: 33 additions & 35 deletions src/modules/xmpp/network.c
Expand Up @@ -45,42 +45,41 @@ int net_listen(char *server, int port)
int fd;
struct sockaddr_in sin;
int on = 1;

memset(&sin, 0, sizeof(struct sockaddr_in));
sin.sin_family = AF_INET;
sin.sin_port = htons(port);
if (!inet_aton(server, &sin.sin_addr)) {

if(!inet_aton(server, &sin.sin_addr)) {
struct hostent *host;

LM_DBG("resolving %s...\n", server);

if (!(host = gethostbyname(server))) {
LM_ERR("resolving %s failed (%s).\n", server,
hstrerror(h_errno));

if(!(host = gethostbyname(server))) {
LM_ERR("resolving %s failed (%s).\n", server, hstrerror(h_errno));
return -1;
}
memcpy(&sin.sin_addr, host->h_addr_list[0], host->h_length);
}
if ((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0) {

if((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0) {
LM_ERR("socket() failed: %s\n", strerror(errno));
return -1;
}

LM_DBG("listening on %s:%d\n", inet_ntoa(sin.sin_addr), port);
if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0) {
LM_WARN("setsockopt(SO_REUSEADDR) failed: %s\n",strerror(errno));

if(setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0) {
LM_WARN("setsockopt(SO_REUSEADDR) failed: %s\n", strerror(errno));
}

if (bind(fd, (struct sockaddr *) &sin, sizeof(struct sockaddr_in)) < 0) {
if(bind(fd, (struct sockaddr *)&sin, sizeof(struct sockaddr_in)) < 0) {
LM_ERR("bind() failed: %s\n", strerror(errno));
close(fd);
return -1;
}

if (listen(fd, 1) < 0) {
if(listen(fd, 1) < 0) {
LM_ERR("listen() failed: %s\n", strerror(errno));
close(fd);
return -1;
Expand All @@ -93,32 +92,31 @@ int net_connect(char *server, int port)
{
int fd;
struct sockaddr_in sin;

memset(&sin, 0, sizeof(struct sockaddr_in));
sin.sin_family = AF_INET;
sin.sin_port = htons(port);
if (!inet_aton(server, &sin.sin_addr)) {

if(!inet_aton(server, &sin.sin_addr)) {
struct hostent *host;

LM_DBG("resolving %s...\n", server);

if (!(host = gethostbyname(server))) {
LM_ERR("resolving %s failed (%s).\n", server,
hstrerror(h_errno));

if(!(host = gethostbyname(server))) {
LM_ERR("resolving %s failed (%s).\n", server, hstrerror(h_errno));
return -1;
}
memcpy(&sin.sin_addr, host->h_addr_list[0], host->h_length);
}
if ((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0) {

if((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0) {
LM_ERR("socket() failed: %s\n", strerror(errno));
return -1;
}

LM_DBG("connecting to %s:%d...\n", inet_ntoa(sin.sin_addr), port);
if (connect(fd, (struct sockaddr *) &sin, sizeof(struct sockaddr_in)) < 0) {

if(connect(fd, (struct sockaddr *)&sin, sizeof(struct sockaddr_in)) < 0) {
LM_ERR("connect() failed: %s\n", strerror(errno));
close(fd);
return -1;
Expand All @@ -135,11 +133,11 @@ int net_send(int fd, const char *buf, int len)

do {
res = send(fd, p, len, 0);
if (res <= 0)
if(res <= 0)
return res;
len -= res;
p += res;
} while (len);
} while(len);

return (p - buf);
}
Expand All @@ -148,13 +146,13 @@ int net_printf(int fd, char *format, ...)
{
va_list args;
char buf[4096];

va_start(args, format);
vsnprintf(buf, sizeof(buf) - 1, format, args);
va_end(args);

LM_DBG("net_printf: [%s]\n", buf);

return net_send(fd, buf, strlen(buf));
}

Expand All @@ -164,11 +162,11 @@ char *net_read_static(int fd)
int res;

res = recv(fd, buf, sizeof(buf) - 1, 0);
if (res < 0) {
if(res < 0) {
LM_ERR("recv() failed: %s\n", strerror(errno));
return NULL;
}
if (!res)
if(!res)
return NULL;
buf[res] = 0;
return buf;
Expand Down
3 changes: 2 additions & 1 deletion src/modules/xmpp/network.h
Expand Up @@ -31,7 +31,8 @@
extern int net_listen(char *server, int port);
extern int net_connect(char *server, int port);
extern int net_send(int fd, const char *buf, int len);
extern int net_printf(int fd, char *format, ...) __attribute__ ((format (printf, 2, 3)));
extern int net_printf(int fd, char *format, ...)
__attribute__((format(printf, 2, 3)));
extern char *net_read_chunk(int fd, int size);
extern char *net_read_static(int fd);

Expand Down

0 comments on commit 709163f

Please sign in to comment.