Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

modify the code style #3067

Merged
merged 2 commits into from
Jan 15, 2020
Merged

modify the code style #3067

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
047a02e
modify the code style
huanghantao Jan 15, 2020
a45f6d7
style: change type* to type *
huanghantao Jan 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions src/core/socket.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ ssize_t swSocket_write_blocking(int __fd, const void *__data, size_t __len)

while (written < (ssize_t) __len)
{
n = write(__fd, (char*) __data + written, __len - written);
n = write(__fd, (char *) __data + written, __len - written);
if (n < 0)
{
if (errno == EINTR)
Expand Down Expand Up @@ -406,7 +406,7 @@ void swSocket_free(swSocket *sock)
int swSocket_bind(int sock, int type, const char *host, int *port)
{
int ret;
swSocketAddress address;
swSocketAddress address = { 0 };

//SO_REUSEADDR option
int option = 1;
Expand All @@ -429,28 +429,26 @@ int swSocket_bind(int sock, int type, const char *host, int *port)
//unix socket
if (type == SW_SOCK_UNIX_DGRAM || type == SW_SOCK_UNIX_STREAM)
{
bzero(&(address.addr.un), sizeof(address.addr.un));
unlink(host);
address.addr.un.sun_family = AF_UNIX;
strncpy(address.addr.un.sun_path, host, sizeof(address.addr.un.sun_path) - 1);
ret = bind(sock, (struct sockaddr*) &(address.addr.un), sizeof(address.addr.un));
ret = bind(sock, (struct sockaddr *) &address.addr.un, sizeof(address.addr.un));
}
//IPv6
else if (type > SW_SOCK_UDP)
{
bzero(&(address.addr.inet_v6), sizeof(address.addr.inet_v6));
if (inet_pton(AF_INET6, host, &(address.addr.inet_v6.sin6_addr)) < 0)
if (inet_pton(AF_INET6, host, &address.addr.inet_v6.sin6_addr) < 0)
{
swSysWarn("inet_pton(AF_INET6, %s) failed", host);
return SW_ERR;
}
address.addr.inet_v6.sin6_port = htons(*port);
address.addr.inet_v6.sin6_family = AF_INET6;
ret = bind(sock, (struct sockaddr *) &(address.addr.inet_v6), sizeof(address.addr.inet_v6));
ret = bind(sock, (struct sockaddr *) &address.addr.inet_v6, sizeof(address.addr.inet_v6));
if (ret == 0 && *port == 0)
{
address.len = sizeof(address.addr.inet_v6);
if (getsockname(sock, (struct sockaddr *) &(address.addr.inet_v6), &(address.len)) != -1)
if (getsockname(sock, (struct sockaddr *) &address.addr.inet_v6, &address.len) != -1)
{
*port = ntohs(address.addr.inet_v6.sin6_port);
}
Expand All @@ -459,19 +457,18 @@ int swSocket_bind(int sock, int type, const char *host, int *port)
//IPv4
else
{
bzero(&(address.addr.inet_v4), sizeof(address.addr.inet_v4));
if (inet_pton(AF_INET, host, &(address.addr.inet_v4.sin_addr)) < 0)
if (inet_pton(AF_INET, host, &address.addr.inet_v4.sin_addr) < 0)
{
swSysWarn("inet_pton(AF_INET, %s) failed", host);
return SW_ERR;
}
address.addr.inet_v4.sin_port = htons(*port);
address.addr.inet_v4.sin_family = AF_INET;
ret = bind(sock, (struct sockaddr *) &(address.addr.inet_v4), sizeof(address.addr.inet_v4));
ret = bind(sock, (struct sockaddr *) &address.addr.inet_v4, sizeof(address.addr.inet_v4));
if (ret == 0 && *port == 0)
{
address.len = sizeof(address.addr.inet_v4);
if (getsockname(sock, (struct sockaddr *) &(address.addr.inet_v4), &(address.len)) != -1)
if (getsockname(sock, (struct sockaddr *) &address.addr.inet_v4, &address.len) != -1)
{
*port = ntohs(address.addr.inet_v4.sin_port);
}
Expand Down