summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/dns.c2
-rw-r--r--src/net/dns.h2
-rw-r--r--src/net/tcp.c46
-rw-r--r--src/net/tcp.h24
-rw-r--r--src/net/udp.c62
-rw-r--r--src/net/udp.h20
6 files changed, 78 insertions, 78 deletions
diff --git a/src/net/dns.c b/src/net/dns.c
index 2167a52..156aeb4 100644
--- a/src/net/dns.c
+++ b/src/net/dns.c
@@ -12,7 +12,7 @@
#include "main.h"
-char *getIPFormDNS(char *domain)
+char *gns_resolv(char *domain)
{
struct hostent *host;
diff --git a/src/net/dns.h b/src/net/dns.h
index 281a056..38e6a9f 100644
--- a/src/net/dns.h
+++ b/src/net/dns.h
@@ -3,6 +3,6 @@
# define DNS_H
-extern char *getIPFormDNS(char *domain);
+extern char *gns_resolv(char *domain);
#endif
diff --git a/src/net/tcp.c b/src/net/tcp.c
index 9efa0c2..85859e0 100644
--- a/src/net/tcp.c
+++ b/src/net/tcp.c
@@ -25,7 +25,7 @@
#include "tcp.h"
-sock_tcp_t *newSockTcp(void)
+sock_tcp_t *sock_tcp_new(void)
{
sock_tcp_t *new;
@@ -35,7 +35,7 @@ sock_tcp_t *newSockTcp(void)
return new;
}
-void destroySockTcp(sock_tcp_t * p)
+void sock_tcp_destroy(sock_tcp_t * p)
{
assert(p != NULL);
free(p);
@@ -50,7 +50,7 @@ static int getProto(char *str)
return -1;
}
-sock_tcp_t *bindTcpSocket(char *address, int port)
+sock_tcp_t *sock_tcp_bind(char *address, int port)
{
sock_tcp_t *new;
unsigned long param_setsock = 1;
@@ -59,7 +59,7 @@ sock_tcp_t *bindTcpSocket(char *address, int port)
assert(port > 0 && port < 65535);
- new = newSockTcp();
+ new = sock_tcp_new();
new->proto = getProto(address);
ret = -1; // no Warnings
@@ -77,7 +77,7 @@ sock_tcp_t *bindTcpSocket(char *address, int port)
if (new->sock < 0) {
fprintf(stderr, _("Unable to create socket when connecting!\n"));
- destroySockTcp(new);
+ sock_tcp_destroy(new);
#ifdef __WIN32__
WSACleanup();
#endif
@@ -117,7 +117,7 @@ sock_tcp_t *bindTcpSocket(char *address, int port)
if (ret < 0) {
fprintf(stderr, _("Unable to bint to port: %d\n"), port);
- destroySockTcp(new);
+ sock_tcp_destroy(new);
#ifdef __WIN32__
WSACleanup();
#endif
@@ -129,7 +129,7 @@ sock_tcp_t *bindTcpSocket(char *address, int port)
return new;
}
-sock_tcp_t *getTcpNewClient(sock_tcp_t * p)
+sock_tcp_t *sock_tcp_accept(sock_tcp_t * p)
{
sock_tcp_t *new;
int client_len;
@@ -137,7 +137,7 @@ sock_tcp_t *getTcpNewClient(sock_tcp_t * p)
assert(p != NULL);
assert(p->sock >= 0);
- new = newSockTcp();
+ new = sock_tcp_new();
new->proto = p->proto;
if (new->proto == PROTO_TCPv4) {
@@ -161,7 +161,7 @@ sock_tcp_t *getTcpNewClient(sock_tcp_t * p)
if (new->sock < 0) {
//printf("XXX\n");
- destroySockTcp(new);
+ sock_tcp_destroy(new);
#ifdef __WIN32__
WSACleanup();
#endif
@@ -171,7 +171,7 @@ sock_tcp_t *getTcpNewClient(sock_tcp_t * p)
return new;
}
-void getSockTcpIp(sock_tcp_t * p, char *str_ip, int len)
+void sock_tcp_get_ip(sock_tcp_t * p, char *str_ip, int len)
{
assert(p != NULL);
assert(str_ip != NULL);
@@ -197,7 +197,7 @@ void getSockTcpIp(sock_tcp_t * p, char *str_ip, int len)
#endif // SUPPORT_IPv6
}
-int getSockTcpPort(sock_tcp_t * p)
+int sock_tcp_get_port(sock_tcp_t * p)
{
assert(p != NULL);
@@ -215,7 +215,7 @@ int getSockTcpPort(sock_tcp_t * p)
return -1;
}
-sock_tcp_t *connectTcpSocket(char *ip, int port)
+sock_tcp_t *sock_tcp_connect(char *ip, int port)
{
sock_tcp_t *new;
int len;
@@ -224,7 +224,7 @@ sock_tcp_t *connectTcpSocket(char *ip, int port)
assert(ip != NULL);
assert(port > 0 && port < 65535);
- new = newSockTcp();
+ new = sock_tcp_new();
new->proto = getProto(ip);
ret = -1; // no Warnnings
@@ -240,7 +240,7 @@ sock_tcp_t *connectTcpSocket(char *ip, int port)
if (new->sock < 0) {
fprintf(stderr, _("Unable to create TCP socket!\n"));
- destroySockTcp(new);
+ sock_tcp_destroy(new);
#ifdef __WIN32__
WSACleanup();
#endif
@@ -270,7 +270,7 @@ sock_tcp_t *connectTcpSocket(char *ip, int port)
if (ret < 0) {
fprintf(stderr, "Unable to connect on: \"%s\" port: \"%d\"\n", ip,
port);
- destroySockTcp(new);
+ sock_tcp_destroy(new);
#ifdef __WIN32__
WSACleanup();
#endif
@@ -281,7 +281,7 @@ sock_tcp_t *connectTcpSocket(char *ip, int port)
return new;
}
-int disableNagle(sock_tcp_t * p)
+int sock_tcp_diable_nagle(sock_tcp_t * p)
{
int flag = 1;
@@ -304,7 +304,7 @@ int disableNagle(sock_tcp_t * p)
return result;
}
-int setTcpSockNonBlock(sock_tcp_t * p)
+int sock_tcp_set_non_block(sock_tcp_t * p)
{
/* Set to nonblocking socket mode */
#ifndef __WIN32__
@@ -313,10 +313,10 @@ int setTcpSockNonBlock(sock_tcp_t * p)
oldFlag = fcntl(p->sock, F_GETFL, 0);
if (fcntl(p->sock, F_SETFL, oldFlag | O_NONBLOCK) == -1) {
- //printf("error setTcpSockNonBlock\n");
+ //printf("error sock_tcp_set_non_block\n");
return -1;
}
- //printf("setTcpSockNonBlock OK\n");
+ //printf("sock_tcp_set_non_block OK\n");
#else
unsigned long arg = 1;
// Operation is FIONBIO. Parameter is pointer on non-zero number.
@@ -328,7 +328,7 @@ int setTcpSockNonBlock(sock_tcp_t * p)
return 0;
}
-int readTcpSocket(sock_tcp_t * p, void *address, int len)
+int sock_tcp_read(sock_tcp_t * p, void *address, int len)
{
assert(p != NULL);
assert(address != NULL);
@@ -336,7 +336,7 @@ int readTcpSocket(sock_tcp_t * p, void *address, int len)
return read(p->sock, address, len);
}
-int writeTcpSocket(sock_tcp_t * p, void *address, int len)
+int sock_tcp_write(sock_tcp_t * p, void *address, int len)
{
assert(p != NULL);
assert(address != NULL);
@@ -344,12 +344,12 @@ int writeTcpSocket(sock_tcp_t * p, void *address, int len)
return write(p->sock, address, len);
}
-void closeTcpSocket(sock_tcp_t * p)
+void sock_tcp_close(sock_tcp_t * p)
{
assert(p != NULL);
close(p->sock);
- destroySockTcp(p);
+ sock_tcp_destroy(p);
#ifdef __WIN32__
WSACleanup();
#endif
diff --git a/src/net/tcp.h b/src/net/tcp.h
index ae46f48..a9cdb4b 100644
--- a/src/net/tcp.h
+++ b/src/net/tcp.h
@@ -31,17 +31,17 @@ typedef struct struct_sock_tcp_t {
# endif
} sock_tcp_t;
-extern sock_tcp_t *newSockTcp(void);
-extern void destroySockTcp(sock_tcp_t * p);
-extern sock_tcp_t *bindTcpSocket(char *addresss, int port);
-extern sock_tcp_t *getTcpNewClient(sock_tcp_t * p);
-extern void getSockTcpIp(sock_tcp_t * p, char *str_ip, int len);
-extern int getSockTcpPort(sock_tcp_t * p);
-extern sock_tcp_t *connectTcpSocket(char *ip, int port);
-extern int disableNagle(sock_tcp_t * p);
-extern int setTcpSockNonBlock(sock_tcp_t * p);
-extern int readTcpSocket(sock_tcp_t * p, void *address, int len);
-extern int writeTcpSocket(sock_tcp_t * p, void *address, int len);
-extern void closeTcpSocket(sock_tcp_t * p);
+extern sock_tcp_t *sock_tcp_new(void);
+extern void sock_tcp_destroy(sock_tcp_t * p);
+extern sock_tcp_t *sock_tcp_bind(char *addresss, int port);
+extern sock_tcp_t *sock_tcp_accept(sock_tcp_t * p);
+extern void sock_tcp_get_ip(sock_tcp_t * p, char *str_ip, int len);
+extern int sock_tcp_get_port(sock_tcp_t * p);
+extern sock_tcp_t *sock_tcp_connect(char *ip, int port);
+extern int sock_tcp_diable_nagle(sock_tcp_t * p);
+extern int sock_tcp_set_non_block(sock_tcp_t * p);
+extern int sock_tcp_read(sock_tcp_t * p, void *address, int len);
+extern int sock_tcp_write(sock_tcp_t * p, void *address, int len);
+extern void sock_tcp_close(sock_tcp_t * p);
#endif
diff --git a/src/net/udp.c b/src/net/udp.c
index 6f5a701..6d61a11 100644
--- a/src/net/udp.c
+++ b/src/net/udp.c
@@ -35,7 +35,7 @@ static int getProto(char *str)
return -1;
}
-sock_udp_t *newSockUdp(void)
+sock_udp_t *sock_udp_new(void)
{
sock_udp_t *new;
@@ -45,20 +45,20 @@ sock_udp_t *newSockUdp(void)
return new;
}
-void destroySockUdp(sock_udp_t * p)
+void sock_udp_destroy(sock_udp_t * p)
{
assert(p != NULL);
free(p);
}
-sock_udp_t *bindUdpSocket(char *address, int port)
+sock_udp_t *sock_udp_bind(char *address, int port)
{
sock_udp_t *new;
int res = -1; // no warninng
assert(port > 0 && port < 65535);
- new = newSockUdp();
+ new = sock_udp_new();
new->proto = getProto(address);
assert(new != NULL);
@@ -75,7 +75,7 @@ sock_udp_t *bindUdpSocket(char *address, int port)
if (new->sock < 0) {
fprintf(stderr, _("Unable to create socket when binding!\n"));
- destroySockUdp(new);
+ sock_udp_destroy(new);
#ifdef __WIN32__
WSACleanup();
#endif
@@ -103,7 +103,7 @@ sock_udp_t *bindUdpSocket(char *address, int port)
if (res < 0) {
fprintf(stderr, _("Unable to set socket %s %d!\n"), address, port);
- destroySockUdp(new);
+ sock_udp_destroy(new);
#ifdef __WIN32__
WSACleanup();
#endif
@@ -113,14 +113,14 @@ sock_udp_t *bindUdpSocket(char *address, int port)
return new;
}
-sock_udp_t *connectUdpSocket(char *address, int port)
+sock_udp_t *sock_udp_connect(char *address, int port)
{
sock_udp_t *new;
assert(address != NULL);
assert(port > 0 && port < 65536);
- new = newSockUdp();
+ new = sock_udp_new();
new->proto = getProto(address);
assert(new != NULL);
@@ -137,7 +137,7 @@ sock_udp_t *connectUdpSocket(char *address, int port)
if (new->sock < 0) {
fprintf(stderr, _("Unable to create socket when connecting!\n"));
- destroySockUdp(new);
+ sock_udp_destroy(new);
#ifdef __WIN32__
WSACleanup();
#endif
@@ -161,7 +161,7 @@ sock_udp_t *connectUdpSocket(char *address, int port)
return new;
}
-int setUdpSockNonBlock(sock_udp_t * p)
+int sock_udp_set_non_block(sock_udp_t * p)
{
/* Set to nonblocking socket mode */
#ifndef __WIN32__
@@ -183,7 +183,7 @@ int setUdpSockNonBlock(sock_udp_t * p)
return 0;
}
-int readUdpSocket(sock_udp_t * src, sock_udp_t * dst, void *address, int len)
+int sock_udp_read(sock_udp_t * src, sock_udp_t * dst, void *address, int len)
{
int addrlen;
int size = -1; // no warninng
@@ -222,10 +222,10 @@ int readUdpSocket(sock_udp_t * src, sock_udp_t * dst, void *address, int len)
if (size < 0) {
char str_ip[STR_IP_SIZE];
- getSockUdpIp(dst, str_ip, STR_IP_SIZE);
+ sock_udp_get_ip(dst, str_ip, STR_IP_SIZE);
fprintf(stderr, _("Unable to read form socket %d %s %d!\n"), size,
- str_ip, getSockUdpPort(dst));
+ str_ip, sock_udp_get_port(dst));
#ifdef __WIN32__
WSACleanup();
@@ -236,7 +236,7 @@ int readUdpSocket(sock_udp_t * src, sock_udp_t * dst, void *address, int len)
return size;
}
-int writeUdpSocket(sock_udp_t * src, sock_udp_t * dst, void *address, int len)
+int sock_udp_write(sock_udp_t * src, sock_udp_t * dst, void *address, int len)
{
int addrlen;
int size = -1; // no warninng
@@ -263,10 +263,10 @@ int writeUdpSocket(sock_udp_t * src, sock_udp_t * dst, void *address, int len)
if (size < 0) {
char str_ip[STR_IP_SIZE];
- getSockUdpIp(dst, str_ip, STR_IP_SIZE);
+ sock_udp_get_ip(dst, str_ip, STR_IP_SIZE);
fprintf(stderr, _("Unable to write on socket %d %s %d %d!\n"), size,
- str_ip, getSockUdpPort(dst), dst->proto);
+ str_ip, sock_udp_get_port(dst), dst->proto);
//assert(0);
#ifdef __WIN32__
@@ -278,7 +278,7 @@ int writeUdpSocket(sock_udp_t * src, sock_udp_t * dst, void *address, int len)
return size;
}
-void getSockUdpIp(sock_udp_t * p, char *str_ip, int len)
+void sock_udp_get_ip(sock_udp_t * p, char *str_ip, int len)
{
assert(p != NULL);
assert(str_ip != NULL);
@@ -299,7 +299,7 @@ void getSockUdpIp(sock_udp_t * p, char *str_ip, int len)
#endif
}
-int getSockUdpPort(sock_udp_t * p)
+int sock_udp_get_port(sock_udp_t * p)
{
assert(p != NULL);
@@ -318,7 +318,7 @@ int getSockUdpPort(sock_udp_t * p)
}
-void closeUdpSocket(sock_udp_t * p)
+void sock_udp_close(sock_udp_t * p)
{
assert(p != NULL);
@@ -328,7 +328,7 @@ void closeUdpSocket(sock_udp_t * p)
closesocket(p->sock);
//WSACleanup(); //kdyz ukoncime socket dobre neni treba cleanup
#endif
- destroySockUdp(p);
+ sock_udp_destroy(p);
}
#if 0
@@ -369,34 +369,34 @@ int main(int argc, char *argv[])
if (strcmp(argv[1], "s") == 0) {
sock_udp_t *cli;
- //sock = bindUdpSocket("::1", atoi(argv[2]), PROTO_UDPv6 );
- sock = bindUdpSocket("127.0.0.1", atoi(argv[2]), PROTO_UDPv4);
+ //sock = sock_udp_bind("::1", atoi(argv[2]), PROTO_UDPv6 );
+ sock = sock_udp_bind("127.0.0.1", atoi(argv[2]), PROTO_UDPv4);
- //cli = newSockUdp(PROTO_UDPv6);
- cli = newSockUdp(PROTO_UDPv4);
+ //cli = sock_udp_new(PROTO_UDPv6);
+ cli = sock_udp_new(PROTO_UDPv4);
while (1) {
while (myWait(sock) == 0);
memset(buf, 0, BUFSIZE);
- ret = readUdpSocket(sock, cli, buf, BUFSIZE);
- writeUdpSocket(sock, cli, buf, ret);
+ ret = sock_udp_read(sock, cli, buf, BUFSIZE);
+ sock_udp_write(sock, cli, buf, ret);
}
}
if (strcmp(argv[1], "c") == 0) {
- //sock = connectUdpSocket("::1", atoi(argv[2]), PROTO_UDPv6);
- sock = connectUdpSocket("127.0.0.1", atoi(argv[2]), PROTO_UDPv4);
+ //sock = sock_udp_connect("::1", atoi(argv[2]), PROTO_UDPv6);
+ sock = sock_udp_connect("127.0.0.1", atoi(argv[2]), PROTO_UDPv4);
strcpy(buf, "Hello world !\n");
- writeUdpSocket(sock, sock, buf, strlen(buf));
+ sock_udp_write(sock, sock, buf, strlen(buf));
memset(buf, 0, BUFSIZE);
- readUdpSocket(sock, sock, buf, BUFSIZE);
+ sock_udp_read(sock, sock, buf, BUFSIZE);
printf("buf = %s", buf);
//while(1)sleep(1);
- closeUdpSocket(sock);
+ sock_udp_close(sock);
}
return 0;
diff --git a/src/net/udp.h b/src/net/udp.h
index c203323..35c9e18 100644
--- a/src/net/udp.h
+++ b/src/net/udp.h
@@ -28,16 +28,16 @@ typedef struct struct_sock_udp_t {
struct sockaddr_in sockAddr;
} sock_udp_t;
-extern sock_udp_t *newSockUdp(void);
-extern void destroySockUdp(sock_udp_t * p);
-extern sock_udp_t *bindUdpSocket(char *address, int port);
-extern sock_udp_t *connectUdpSocket(char *address, int port);
-extern int setUdpSockNonBlock(sock_udp_t * p);
-extern int readUdpSocket(sock_udp_t * src, sock_udp_t * dst, void *address,
+extern sock_udp_t *sock_udp_new(void);
+extern void sock_udp_destroy(sock_udp_t * p);
+extern sock_udp_t *sock_udp_bind(char *address, int port);
+extern sock_udp_t *sock_udp_connect(char *address, int port);
+extern int sock_udp_set_non_block(sock_udp_t * p);
+extern int sock_udp_read(sock_udp_t * src, sock_udp_t * dst, void *address,
int len);
-extern int writeUdpSocket(sock_udp_t * src, sock_udp_t * dst, void *address,
+extern int sock_udp_write(sock_udp_t * src, sock_udp_t * dst, void *address,
int len);
-extern void getSockUdpIp(sock_udp_t * p, char *str_ip, int len);
-extern int getSockUdpPort(sock_udp_t * p);
-extern void closeUdpSocket(sock_udp_t * p);
+extern void sock_udp_get_ip(sock_udp_t * p, char *str_ip, int len);
+extern int sock_udp_get_port(sock_udp_t * p);
+extern void sock_udp_close(sock_udp_t * p);
#endif
generated by cgit v1.2.3 (git 2.46.0) at 2026-09-13 19:23:22 +0000