summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorDusan Durech <dusan.d@centrum.sk>2008-11-15 16:08:21 +0100
committerDusan Durech <dusan.d@centrum.sk>2008-11-15 16:08:21 +0100
commit35084eaadf8b37f5c4a325f0d4b01767753ee9c3 (patch)
tree8ca9a541783690eb6087a52faafa75e9a53d1521 /src/net
parent98875c5a636f50fe89b9394b8193e86094ae14e0 (diff)
modification coding stile
Diffstat (limited to 'src/net')
-rw-r--r--src/net/tcp.c17
-rw-r--r--src/net/udp.c34
2 files changed, 24 insertions, 27 deletions
diff --git a/src/net/tcp.c b/src/net/tcp.c
index ca11eb3..d8a40d8 100644
--- a/src/net/tcp.c
+++ b/src/net/tcp.c
@@ -55,6 +55,7 @@ sock_tcp_t *bindTcpSocket(char *address, int port, int proto)
if (new->proto == PROTO_TCPv4) {
new->sock = socket(AF_INET, SOCK_STREAM, 0);
}
+
#ifdef SUPPORT_IPv6
if (new->proto == PROTO_TCPv6) {
new->sock = socket(AF_INET6, SOCK_STREAM, 0);
@@ -114,15 +115,13 @@ sock_tcp_t *getTcpNewClient(sock_tcp_t * p)
if (new->proto == PROTO_TCPv4) {
client_len = sizeof(new->sockAddr);
- new->sock = accept(p->sock, (struct sockaddr *) &new->sockAddr,
- (socklen_t *) & client_len);
+ new->sock = accept(p->sock, (struct sockaddr *) &new->sockAddr, (socklen_t *) & client_len);
}
#ifdef SUPPORT_IPv6
if (new->proto == PROTO_TCPv6) {
client_len = sizeof(new->sockAddr6);
- new->sock = accept(p->sock, (struct sockaddr *) &new->sockAddr6,
- (socklen_t *) & client_len);
+ new->sock = accept(p->sock, (struct sockaddr *) &new->sockAddr6, (socklen_t *) & client_len);
}
#endif
@@ -186,6 +185,7 @@ sock_tcp_t *connectTcpSocket(char *ip, int port, int proto)
if (new->proto == PROTO_TCPv4) {
new->sock = socket(AF_INET, SOCK_STREAM, 0);
}
+
#ifdef SUPPORT_IPv6
if (new->proto == PROTO_TCPv6) {
new->sock = socket(AF_INET6, SOCK_STREAM, 0);
@@ -206,6 +206,7 @@ sock_tcp_t *connectTcpSocket(char *ip, int port, int proto)
len = sizeof(new->sockAddr);
ret = connect(new->sock, (struct sockaddr *) &new->sockAddr, len);
}
+
#ifdef SUPPORT_IPv6
if (new->proto == PROTO_TCPv6) {
new->sockAddr6.sin6_family = AF_INET6;
@@ -235,10 +236,10 @@ int disableNagle(sock_tcp_t * p)
int result;
result = setsockopt(p->sock, /* socket affected */
- IPPROTO_TCP, /* set option at TCP level */
- TCP_NODELAY, /* name of option */
- (char *) &flag, /* the cast is historical cruft */
- sizeof(int)); /* length of option value */
+ IPPROTO_TCP, /* set option at TCP level */
+ TCP_NODELAY, /* name of option */
+ (char *) &flag, /* the cast is historical cruft */
+ sizeof(int)); /* length of option value */
#if 0
if (result < 0) {
diff --git a/src/net/udp.c b/src/net/udp.c
index 99fa19e..68e943f 100644
--- a/src/net/udp.c
+++ b/src/net/udp.c
@@ -57,6 +57,7 @@ sock_udp_t *bindUdpSocket(char *address, int port, int proto)
if (new->proto == PROTO_UDPv4) {
new->sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
}
+
#ifdef SUPPORT_IPv6
if (new->proto == PROTO_UDPv6) {
new->sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
@@ -79,9 +80,7 @@ sock_udp_t *bindUdpSocket(char *address, int port, int proto)
new->sockAddr.sin_port = htons(port);
new->sockAddr.sin_addr.s_addr = inet_addr(address);
- res =
- bind(new->sock, (struct sockaddr *) &(new->sockAddr),
- sizeof(new->sockAddr));
+ res = bind(new->sock, (struct sockaddr *) &(new->sockAddr), sizeof(new->sockAddr));
}
#ifdef SUPPORT_IPv6
if (new->proto == PROTO_UDPv6) {
@@ -89,9 +88,7 @@ sock_udp_t *bindUdpSocket(char *address, int port, int proto)
new->sockAddr6.sin6_port = htons(port);
inet_pton(AF_INET6, address, &(new->sockAddr6.sin6_addr));
- res =
- bind(new->sock, (struct sockaddr *) &(new->sockAddr6),
- sizeof(new->sockAddr6));
+ res = bind(new->sock, (struct sockaddr *) &(new->sockAddr6), sizeof(new->sockAddr6));
}
#endif
@@ -121,6 +118,7 @@ sock_udp_t *connectUdpSocket(char *address, int port, int proto)
if (new->proto == PROTO_UDPv4) {
new->sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
}
+
#ifdef SUPPORT_IPv6
if (new->proto == PROTO_UDPv6) {
new->sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
@@ -188,23 +186,23 @@ int readUdpSocket(sock_udp_t * src, sock_udp_t * dst, void *address, int len)
addrlen = sizeof(src->sockAddr);
#ifndef __WIN32
- size =
- recvfrom(src->sock, address, len, 0,
- (struct sockaddr *) &dst->sockAddr,
- (socklen_t *) & addrlen);
+ size = recvfrom(src->sock, address, len, 0,
+ (struct sockaddr *) &dst->sockAddr,
+ (socklen_t *) & addrlen);
#else
size =
recvfrom(src->sock, address, len, 0,
- (struct sockaddr *) &dst->sockAddr, (int *) &addrlen);
+ (struct sockaddr *) &dst->sockAddr, (int *) &addrlen);
#endif
}
+
#ifdef SUPPORT_IPv6
if (dst->proto == PROTO_UDPv6) {
addrlen = sizeof(src->sockAddr6);
size = recvfrom(src->sock, address, len, 0,
- (struct sockaddr *) &dst->sockAddr6,
- (socklen_t *) & addrlen);
+ (struct sockaddr *) &dst->sockAddr6,
+ (socklen_t *) & addrlen);
}
#endif
@@ -238,17 +236,15 @@ int writeUdpSocket(sock_udp_t * src, sock_udp_t * dst, void *address, int len)
if (dst->proto == PROTO_UDPv4) {
addrlen = sizeof(src->sockAddr);
- size =
- sendto(src->sock, address, len, 0,
- (struct sockaddr *) &dst->sockAddr, addrlen);
+ size = sendto(src->sock, address, len, 0,
+ (struct sockaddr *) &dst->sockAddr, addrlen);
}
#ifdef SUPPORT_IPv6
if (dst->proto == PROTO_UDPv6) {
addrlen = sizeof(src->sockAddr6);
- size =
- sendto(src->sock, address, len, 0,
- (struct sockaddr *) &dst->sockAddr6, addrlen);
+ size = sendto(src->sock, address, len, 0,
+ (struct sockaddr *) &dst->sockAddr6, addrlen);
}
#endif