Sun, 29 Mar 2026 15:35:55 +0200
fix wrong way of granting permissions
|
1
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
1 | /* |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
3 | * |
|
55
54ea19938d57
updated copyright and version info
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
4 | * Copyright 2016 Mike Becker. All rights reserved. |
|
1
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
5 | * |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
8 | * |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
11 | * |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
15 | * |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
27 | * |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
28 | */ |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
29 | |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
30 | #include <stdlib.h> |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
31 | #include <string.h> |
|
94
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
32 | #include <stdio.h> |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
33 | #include <unistd.h> |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
34 | #include <sys/un.h> |
|
95
2624e7ebb525
fix missing domain socket permissions for other players
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
35 | #include <sys/stat.h> |
|
1
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
36 | #include "network.h" |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
37 | |
|
94
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
38 | int net_create_tcp(Server *server, short port) { |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
39 | memset(server, 0, sizeof(Server)); |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
40 | server->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); |
|
1
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
41 | if (server->fd > -1) { |
|
74
163c0ebacf14
fix compilation error when using C23
Mike Becker <universe@uap-core.de>
parents:
59
diff
changeset
|
42 | int one = 1; |
|
163c0ebacf14
fix compilation error when using C23
Mike Becker <universe@uap-core.de>
parents:
59
diff
changeset
|
43 | setsockopt(server->fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(int)); |
|
94
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
44 | |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
45 | struct sockaddr_in addr; |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
46 | addr.sin_family = AF_INET; |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
47 | addr.sin_addr.s_addr = INADDR_ANY; |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
48 | addr.sin_port = htons(port); |
|
2
0a08f79c320d
fixed network code + added game info and transmission of game info
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
49 | if (bind(server->fd, (struct sockaddr*)&addr, sizeof(addr))) { |
|
1
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
50 | server->fd = -1; |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
51 | return 1; |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
52 | } else { |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
53 | return 0; |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
54 | } |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
55 | } else { |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
56 | return 1; |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
57 | } |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
58 | } |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
59 | |
|
94
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
60 | int net_find_tcp(Server *server, char *host, short port) { |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
61 | memset(server, 0, sizeof(Server)); |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
62 | server->fd = -1; |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
63 | |
| 87 | 64 | struct addrinfo hints = {0}; |
|
1
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
65 | hints.ai_socktype = SOCK_STREAM; |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
66 | hints.ai_protocol = IPPROTO_TCP; |
|
93
9b64437262a2
fix missing address family hint for getaddrinfo()
Mike Becker <universe@uap-core.de>
parents:
92
diff
changeset
|
67 | hints.ai_family = AF_INET; |
|
94
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
68 | char portstr[6]; |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
69 | sprintf(portstr, "%hd", port); |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
70 | return getaddrinfo(host, portstr, &hints, &server->info); |
|
1
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
71 | } |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
72 | |
|
94
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
73 | int net_create_sock(Server *server, char * path) { |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
74 | memset(server, 0, sizeof(Server)); |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
75 | server->fd = socket(AF_UNIX, SOCK_STREAM, 0); |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
76 | if (server->fd > -1) { |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
77 | struct sockaddr_un addr; |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
78 | addr.sun_family = AF_UNIX; |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
79 | addr.sun_family = AF_UNIX; |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
80 | strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1); |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
81 | if (bind(server->fd, (struct sockaddr*)&addr, sizeof(addr))) { |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
82 | server->fd = -1; |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
83 | return 1; |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
84 | } else { |
|
96
5faa21316c85
fix wrong way of granting permissions
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
85 | chmod(path, S_IRWXU | S_IRWXG | S_IRWXO); |
|
94
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
86 | return 0; |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
87 | } |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
88 | } else { |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
89 | return 1; |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
90 | } |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
91 | } |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
92 | |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
93 | int net_find_sock(Server *server, char *path) { |
|
1
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
94 | memset(server, 0, sizeof(Server)); |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
95 | server->fd = -1; |
|
94
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
96 | |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
97 | server->info = calloc(1, sizeof(struct addrinfo)); |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
98 | server->info->ai_family = AF_UNIX; |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
99 | server->info->ai_socktype = SOCK_STREAM; |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
100 | server->info->ai_protocol = 0; |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
101 | struct sockaddr_un *addr = malloc(sizeof(struct sockaddr_un)); |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
102 | addr->sun_family = AF_UNIX; |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
103 | strncpy(addr->sun_path, path, sizeof(addr->sun_path) - 1); |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
104 | server->info->ai_addr = (struct sockaddr*) addr; |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
105 | server->info->ai_addrlen = sizeof(struct sockaddr_un); |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
106 | return 0; |
|
1
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
107 | } |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
108 | |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
109 | int net_listen(Server *server) { |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
110 | listen(server->fd, 1); |
|
56
11b57a15d11a
fixed hypthetical bug, where the client address is not correctly retrieved by accept()
Mike Becker <universe@uap-core.de>
parents:
55
diff
changeset
|
111 | Client* client = malloc(sizeof(Client)); |
|
1
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
112 | client->fd = -1; |
|
56
11b57a15d11a
fixed hypthetical bug, where the client address is not correctly retrieved by accept()
Mike Becker <universe@uap-core.de>
parents:
55
diff
changeset
|
113 | client->address_len = sizeof(client->address); |
|
1
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
114 | server->client = client; |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
115 | |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
116 | client->fd = accept(server->fd, |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
117 | &(client->address), &(client->address_len)); |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
118 | |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
119 | return client->fd == -1; |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
120 | } |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
121 | |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
122 | int net_connect(Server *server) { |
|
2
0a08f79c320d
fixed network code + added game info and transmission of game info
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
123 | |
|
0a08f79c320d
fixed network code + added game info and transmission of game info
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
124 | Client* client = calloc(1, sizeof(Client)); |
|
0a08f79c320d
fixed network code + added game info and transmission of game info
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
125 | client->fd = -1; |
|
94
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
126 | server->fd = socket( |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
127 | server->info->ai_family, |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
128 | server->info->ai_socktype, |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
129 | server->info->ai_protocol |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
130 | ); |
|
2
0a08f79c320d
fixed network code + added game info and transmission of game info
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
131 | server->client = client; |
|
0a08f79c320d
fixed network code + added game info and transmission of game info
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
132 | |
|
0a08f79c320d
fixed network code + added game info and transmission of game info
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
133 | if (server->fd == -1) { |
|
1
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
134 | return 1; |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
135 | } |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
136 | |
|
2
0a08f79c320d
fixed network code + added game info and transmission of game info
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
137 | return connect(server->fd, server->info->ai_addr, server->info->ai_addrlen); |
|
1
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
138 | } |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
139 | |
|
94
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
140 | void net_destroy(Server *server) { |
|
1
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
141 | if (server->info) { |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
142 | freeaddrinfo(server->info); |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
143 | } |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
144 | if (server->client) { |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
145 | shutdown(server->client->fd, SHUT_RDWR); |
|
94
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
146 | close(server->client->fd); |
|
1
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
147 | free(server->client); |
|
94
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
148 | server->client = NULL; |
|
1
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
149 | } |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
150 | if (server->fd > -1) { |
|
94
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
151 | shutdown(server->fd, SHUT_RDWR); |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
152 | close(server->fd); |
|
864f59271974
implement option to play via Unix domain socket
Mike Becker <universe@uap-core.de>
parents:
93
diff
changeset
|
153 | server->fd = -1; |
|
1
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
154 | } |
|
e5fbb8f9edbe
added (single) client / server architecture
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
155 | } |
|
2
0a08f79c320d
fixed network code + added game info and transmission of game info
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
156 | |
|
22
41bbfd4d17a3
improved network performance
Mike Becker <universe@uap-core.de>
parents:
7
diff
changeset
|
157 | void net_send_code(int socket, uint8_t code) { |
|
41bbfd4d17a3
improved network performance
Mike Becker <universe@uap-core.de>
parents:
7
diff
changeset
|
158 | send(socket, &code, sizeof(uint8_t), 0); |
|
3
3693fd2eb0e9
changed UI to ncurses session + added network handshake
Mike Becker <universe@uap-core.de>
parents:
2
diff
changeset
|
159 | } |
|
3693fd2eb0e9
changed UI to ncurses session + added network handshake
Mike Becker <universe@uap-core.de>
parents:
2
diff
changeset
|
160 | |
|
22
41bbfd4d17a3
improved network performance
Mike Becker <universe@uap-core.de>
parents:
7
diff
changeset
|
161 | void net_send_data(int socket, uint8_t code, void *data, size_t len) { |
|
41bbfd4d17a3
improved network performance
Mike Becker <universe@uap-core.de>
parents:
7
diff
changeset
|
162 | uint8_t pkg[len+1]; |
|
41bbfd4d17a3
improved network performance
Mike Becker <universe@uap-core.de>
parents:
7
diff
changeset
|
163 | pkg[0] = code; |
|
41bbfd4d17a3
improved network performance
Mike Becker <universe@uap-core.de>
parents:
7
diff
changeset
|
164 | memcpy(pkg+1, data, len); |
|
41bbfd4d17a3
improved network performance
Mike Becker <universe@uap-core.de>
parents:
7
diff
changeset
|
165 | send(socket, pkg, len+1, 0); |
|
2
0a08f79c320d
fixed network code + added game info and transmission of game info
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
166 | } |
|
0a08f79c320d
fixed network code + added game info and transmission of game info
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
167 | |
|
22
41bbfd4d17a3
improved network performance
Mike Becker <universe@uap-core.de>
parents:
7
diff
changeset
|
168 | uint8_t net_recieve_code(int socket) { |
|
41bbfd4d17a3
improved network performance
Mike Becker <universe@uap-core.de>
parents:
7
diff
changeset
|
169 | uint8_t code; |
|
46
4dcfb4c58b6d
netcode is now aware of connection losses
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
170 | if (recv(socket, &code, sizeof(code), 0) == sizeof(code)) { |
|
4dcfb4c58b6d
netcode is now aware of connection losses
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
171 | return code; |
|
4dcfb4c58b6d
netcode is now aware of connection losses
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
172 | } else { |
|
4dcfb4c58b6d
netcode is now aware of connection losses
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
173 | return NETCODE_CONNLOST; |
|
4dcfb4c58b6d
netcode is now aware of connection losses
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
174 | } |
|
2
0a08f79c320d
fixed network code + added game info and transmission of game info
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
175 | } |
|
0a08f79c320d
fixed network code + added game info and transmission of game info
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
176 | |
|
0a08f79c320d
fixed network code + added game info and transmission of game info
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
177 | void net_recieve_data(int socket, void *data, size_t len) { |
|
45
e14a1d9aa91d
removed nonblocking sockets for causing problems and not being necessary
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
178 | recv(socket, data, len, MSG_WAITALL); |
|
2
0a08f79c320d
fixed network code + added game info and transmission of game info
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
179 | } |