1.6.0
This commit is contained in:
@@ -33,7 +33,7 @@ int main(int argc, char **argv)
|
|||||||
address = argv[1];
|
address = argv[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
Sock *client = sock(SOCK_IPV4, SOCK_TCP);
|
Sock *client = sock_create(SOCK_IPV4, SOCK_TCP);
|
||||||
if (client == NULL) {
|
if (client == NULL) {
|
||||||
fprintf(stderr, "ERROR: Could not create socket\n");
|
fprintf(stderr, "ERROR: Could not create socket\n");
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ disconnect:
|
|||||||
|
|
||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
Sock *server = sock(SOCK_IPV4, SOCK_TCP);
|
Sock *server = sock_create(SOCK_IPV4, SOCK_TCP);
|
||||||
if (server == NULL) {
|
if (server == NULL) {
|
||||||
fprintf(stderr, "ERROR: Could not create socket\n");
|
fprintf(stderr, "ERROR: Could not create socket\n");
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ int main(void)
|
|||||||
{
|
{
|
||||||
char *err = "None";
|
char *err = "None";
|
||||||
|
|
||||||
Sock *socket = sock(SOCK_IPV4, SOCK_TCP);
|
Sock *socket = sock_create(SOCK_IPV4, SOCK_TCP);
|
||||||
if (socket == NULL) { err = "create"; goto defer; }
|
if (socket == NULL) { err = "create"; goto defer; }
|
||||||
|
|
||||||
SockAddr addr = sock_addr("127.0.0.1", 6969);
|
SockAddr addr = sock_addr("127.0.0.1", 6969);
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ int main(void)
|
|||||||
{
|
{
|
||||||
bool err = false;
|
bool err = false;
|
||||||
|
|
||||||
Sock *s = sock(SOCK_IPV6, SOCK_TCP);
|
Sock *s = sock_create(SOCK_IPV6, SOCK_TCP);
|
||||||
if (s == NULL) { err = "create"; goto defer; }
|
if (s == NULL) { err = "create"; goto defer; }
|
||||||
|
|
||||||
SockAddr addr = sock_addr("::1", 6969);
|
SockAddr addr = sock_addr("::1", 6969);
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ int main(void)
|
|||||||
{
|
{
|
||||||
char *err = "None";
|
char *err = "None";
|
||||||
|
|
||||||
Sock *server = sock(SOCK_IPV4, SOCK_TCP);
|
Sock *server = sock_create(SOCK_IPV4, SOCK_TCP);
|
||||||
if (server == NULL) { err = "create"; goto defer; }
|
if (server == NULL) { err = "create"; goto defer; }
|
||||||
|
|
||||||
SockAddr addr = sock_addr("0.0.0.0", 6969);
|
SockAddr addr = sock_addr("0.0.0.0", 6969);
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ int main(void)
|
|||||||
{
|
{
|
||||||
bool err = false;
|
bool err = false;
|
||||||
|
|
||||||
Sock *server = sock(SOCK_IPV6, SOCK_TCP);
|
Sock *server = sock_create(SOCK_IPV6, SOCK_TCP);
|
||||||
if (server == NULL) { err = true; goto close; }
|
if (server == NULL) { err = true; goto close; }
|
||||||
|
|
||||||
SockAddr addr = sock_addr("::", 6969);
|
SockAddr addr = sock_addr("::", 6969);
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ int main(void)
|
|||||||
|
|
||||||
printf("%s:%d\n", addr.str, addr.port);
|
printf("%s:%d\n", addr.str, addr.port);
|
||||||
|
|
||||||
Sock *s = sock(addr.type, SOCK_TCP);
|
Sock *s = sock_create(addr.type, SOCK_TCP);
|
||||||
if (s == NULL) {
|
if (s == NULL) {
|
||||||
fprintf(stderr, "sock_create: ");
|
fprintf(stderr, "sock_create: ");
|
||||||
sock_log_error(s);
|
sock_log_error(s);
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
Sock *client = sock(SOCK_IPV4, SOCK_UDP);
|
Sock *client = sock_create(SOCK_IPV4, SOCK_UDP);
|
||||||
if (client == NULL) {
|
if (client == NULL) {
|
||||||
perror("sock_create");
|
perror("sock_create");
|
||||||
return 1;
|
return 1;
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
Sock *server = sock(SOCK_IPV4, SOCK_UDP);
|
Sock *server = sock_create(SOCK_IPV4, SOCK_UDP);
|
||||||
if (server == NULL) {
|
if (server == NULL) {
|
||||||
perror("sock_create");
|
perror("sock_create");
|
||||||
return 1;
|
return 1;
|
||||||
|
|||||||
4
sock.h
4
sock.h
@@ -59,7 +59,7 @@ typedef struct {
|
|||||||
} SockThreadData;
|
} SockThreadData;
|
||||||
|
|
||||||
// Create a socket with the corresponding domain and type
|
// Create a socket with the corresponding domain and type
|
||||||
Sock *sock(SockAddrType domain, SockType type);
|
Sock *sock_create(SockAddrType domain, SockType type);
|
||||||
|
|
||||||
// Create a SockAddr structure from primitives
|
// Create a SockAddr structure from primitives
|
||||||
SockAddr sock_addr(const char *addr, int port);
|
SockAddr sock_addr(const char *addr, int port);
|
||||||
@@ -112,7 +112,7 @@ void *sock__accept_thread(void *data);
|
|||||||
extern "C" { // Prevent name mangling
|
extern "C" { // Prevent name mangling
|
||||||
#endif // __cplusplus
|
#endif // __cplusplus
|
||||||
|
|
||||||
Sock *sock(SockAddrType domain, SockType type)
|
Sock *sock_create(SockAddrType domain, SockType type)
|
||||||
{
|
{
|
||||||
Sock *sock = (Sock*)malloc(sizeof(*sock));
|
Sock *sock = (Sock*)malloc(sizeof(*sock));
|
||||||
if (sock == NULL) {
|
if (sock == NULL) {
|
||||||
|
|||||||
Reference in New Issue
Block a user