Diffstat (limited to 'noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc b/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc index 0630d04..664ba92 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc +++ b/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc | |||
@@ -1,12 +1,13 @@ | |||
1 | /* | 1 | /* |
2 | * Communication protocol | 2 | * Communication protocol |
3 | * | 3 | * |
4 | * $Id$ | 4 | * $Id$ |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include "wl_types.hh" | ||
7 | #include "wl_proto.hh" | 8 | #include "wl_proto.hh" |
8 | #include "wl_log.hh" | 9 | #include "wl_log.hh" |
9 | #include "wl_sock.hh" | 10 | #include "wl_sock.hh" |
10 | 11 | ||
11 | /* Adds a field to the buffer */ | 12 | /* Adds a field to the buffer */ |
12 | int add_field(char *buffer, const char *string, int len) | 13 | int add_field(char *buffer, const char *string, int len) |
@@ -31,13 +32,13 @@ int get_field(const char *buffer, char *out, int maxlen) | |||
31 | /* Get length of value */ | 32 | /* Get length of value */ |
32 | memcpy(len, buffer, 3); | 33 | memcpy(len, buffer, 3); |
33 | 34 | ||
34 | /* Copy buffer to out pointer */ | 35 | /* Copy buffer to out pointer */ |
35 | memset(out, 0, maxlen); | 36 | memset(out, 0, maxlen); |
36 | 37 | ||
37 | if(atoi(len)-3 > maxlen -1) | 38 | if(atoi(len) > maxlen -1) |
38 | memcpy(out, buffer + 3, maxlen - 1); | 39 | memcpy(out, buffer + 3, maxlen - 1); |
39 | else | 40 | else |
40 | memcpy(out, buffer + 3, atoi(len)); | 41 | memcpy(out, buffer + 3, atoi(len)); |
41 | 42 | ||
42 | /* Return length of whole field (including 3 byte length) */ | 43 | /* Return length of whole field (including 3 byte length) */ |
43 | return (atoi(len) + 3); | 44 | return (atoi(len) + 3); |
@@ -51,13 +52,13 @@ int send_network_found (const char *guihost, int guiport, void *structure) | |||
51 | unsigned int len = 0; | 52 | unsigned int len = 0; |
52 | 53 | ||
53 | ptr = (wl_network_t *)structure; | 54 | ptr = (wl_network_t *)structure; |
54 | 55 | ||
55 | /* Type = Found new net (without length field) */ | 56 | /* Type = Found new net (without length field) */ |
56 | memset(temp, 0, sizeof(temp)); | 57 | memset(temp, 0, sizeof(temp)); |
57 | snprintf(temp, sizeof(temp), "%.2d", NETFOUND); | 58 | snprintf(temp, sizeof(temp), "%.2d", WL_NETFOUND); |
58 | memcpy(buffer, temp, 2); | 59 | memcpy(buffer, temp, 2); |
59 | len += 2; | 60 | len += 2; |
60 | 61 | ||
61 | /* Set Net-type */ | 62 | /* Set Net-type */ |
62 | memset(temp, 0, sizeof(temp)); | 63 | memset(temp, 0, sizeof(temp)); |
63 | snprintf(temp, sizeof(temp), "%d", ptr->net_type); | 64 | snprintf(temp, sizeof(temp), "%d", ptr->net_type); |
@@ -95,13 +96,13 @@ int get_network_found (void *structure, const char *buffer) | |||
95 | { | 96 | { |
96 | wl_network_t *ptr; | 97 | wl_network_t *ptr; |
97 | char temp[5]; | 98 | char temp[5]; |
98 | unsigned int len = 0; | 99 | unsigned int len = 0; |
99 | 100 | ||
100 | ptr = (wl_network_t *)structure; | 101 | ptr = (wl_network_t *)structure; |
101 | 102 | ||
102 | /* packet type already determined, skip check */ | 103 | /* packet type already determined, skip check */ |
103 | len += 2; | 104 | len += 2; |
104 | 105 | ||
105 | /* Get net type (accesspoint || ad-hoc || ...) */ | 106 | /* Get net type (accesspoint || ad-hoc || ...) */ |
106 | memset(temp, 0, sizeof(temp)); | 107 | memset(temp, 0, sizeof(temp)); |
107 | len += get_field(buffer + len, temp, sizeof(temp)); | 108 | len += get_field(buffer + len, temp, sizeof(temp)); |