diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/crapnet.cpp | 26 | ||||
| -rw-r--r-- | src/tools/dilate.c | 2 | ||||
| -rw-r--r-- | src/tools/tileset_borderfix.c | 2 |
3 files changed, 14 insertions, 16 deletions
diff --git a/src/tools/crapnet.cpp b/src/tools/crapnet.cpp index b3d2764f..5b7adf52 100644 --- a/src/tools/crapnet.cpp +++ b/src/tools/crapnet.cpp @@ -1,16 +1,13 @@ -#include <baselib/system.h> -#include <baselib/network.h> +#include <engine/system.h> #include <cstdlib> -using namespace baselib; - struct packet { packet *prev; packet *next; - netaddr4 send_to; + NETADDR4 send_to; int64 timestamp; int id; int data_size; @@ -22,11 +19,11 @@ static packet *last = (packet *)0; static int current_latency = 0; static int debug = 0; -int run(int port, netaddr4 dest) +int run(int port, NETADDR4 dest) { - netaddr4 src(0,0,0,0,port); - socket_udp4 socket; - socket.open(src); + NETADDR4 src = {{0,0,0,0},port}; + NETSOCKET socket = net_udp4_create(src); + char buffer[1024*2]; int id = 0; @@ -36,8 +33,8 @@ int run(int port, netaddr4 dest) while(1) { // fetch data - netaddr4 from; - int bytes = socket.recv(&from, buffer, 1024*2); + NETADDR4 from; + int bytes = net_udp4_recv(socket, &from, buffer, 1024*2); if(bytes <= 0) break; @@ -47,7 +44,7 @@ int run(int port, netaddr4 dest) // create new packet packet *p = (packet *)mem_alloc(sizeof(packet)+bytes, 1); - if(from == dest) + if(net_addr4_cmp(&from, &dest) == 0) p->send_to = src; else { @@ -100,7 +97,7 @@ int run(int port, netaddr4 dest) // send and remove packet //if((rand()%10) != 0) // heavy packetloss - socket.send(&p->send_to, p->data, p->data_size); + net_udp4_send(socket, &p->send_to, p->data, p->data_size); // update lag double flux = rand()/(double)RAND_MAX; @@ -124,6 +121,7 @@ int run(int port, netaddr4 dest) int main(int argc, char **argv) { - run(8302, netaddr4(127,0,0,1,8303)); + NETADDR4 a = {{127,0,0,1},8303}; + run(8302, a); return 0; } diff --git a/src/tools/dilate.c b/src/tools/dilate.c index ab1a196f..aba46ed1 100644 --- a/src/tools/dilate.c +++ b/src/tools/dilate.c @@ -1,5 +1,5 @@ -#include "../engine/client/pnglite/pnglite.c" +#include "../engine/external/pnglite/pnglite.c" typedef struct pixel_t { diff --git a/src/tools/tileset_borderfix.c b/src/tools/tileset_borderfix.c index 4b31c2f0..aa643895 100644 --- a/src/tools/tileset_borderfix.c +++ b/src/tools/tileset_borderfix.c @@ -1,5 +1,5 @@ -#include "../engine/client/pnglite/pnglite.c" +#include "../engine/external/pnglite/pnglite.c" typedef struct pixel_t { |