author | mjm <mjm> | 2002-11-27 21:16:52 (UTC) |
---|---|---|
committer | mjm <mjm> | 2002-11-27 21:16:52 (UTC) |
commit | e16163a106d5f814e9774f6a630cdb2ee488a616 (patch) (unidiff) | |
tree | ec0468c5a4cc889f3c4f7cca26c3dcb1d3e324b6 /noncore/net/wellenreiter | |
parent | c118084479a4d146244b3e9e86b958f618a80a6d (diff) | |
download | opie-e16163a106d5f814e9774f6a630cdb2ee488a616.zip opie-e16163a106d5f814e9774f6a630cdb2ee488a616.tar.gz opie-e16163a106d5f814e9774f6a630cdb2ee488a616.tar.bz2 |
new funection recvcomm for receiving commands, cleanup,...
-rw-r--r-- | noncore/net/wellenreiter/libwellenreiter/source/sock.cc | 28 | ||||
-rw-r--r-- | noncore/net/wellenreiter/libwellenreiter/source/sock.hh | 1 |
2 files changed, 25 insertions, 4 deletions
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/sock.cc b/noncore/net/wellenreiter/libwellenreiter/source/sock.cc index 2cc16eb..90fc20a 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/sock.cc +++ b/noncore/net/wellenreiter/libwellenreiter/source/sock.cc | |||
@@ -45,29 +45,49 @@ int sendcomm(const char *host, int port, const char *string, ...) | |||
45 | /* Generate string */ | 45 | /* Generate string */ |
46 | memset(buffer, 0, sizeof(buffer)); | 46 | memset(buffer, 0, sizeof(buffer)); |
47 | va_start(ap, string); | 47 | va_start(ap, string); |
48 | vsnprintf(buffer, sizeof(buffer)-1, string, ap); | 48 | vsnprintf(buffer, sizeof(buffer)-1, string, ap); |
49 | va_end(ap); | 49 | va_end(ap); |
50 | 50 | ||
51 | saddr.sin_family = AF_INET; | ||
52 | saddr.sin_port = htons(port); | ||
53 | saddr.sin_addr.s_addr = inet_addr(host); | ||
54 | |||
51 | /* Setup socket */ | 55 | /* Setup socket */ |
52 | if((sock=socket(AF_INET, SOCK_DGRAM, 0)) < 0) | 56 | if((sock=socket(AF_INET, SOCK_DGRAM, 0)) < 0) |
53 | { | 57 | { |
54 | wl_logerr("Cannot set up socket: %s", strerror(errno)); | 58 | wl_logerr("Cannot set up socket: %s", strerror(errno)); |
55 | return -1; | 59 | return -1; |
56 | } | 60 | } |
57 | 61 | ||
58 | saddr.sin_family = AF_INET; | ||
59 | saddr.sin_port = htons(port); | ||
60 | saddr.sin_addr.s_addr = inet_addr(host); | ||
61 | |||
62 | if(sendto(sock, buffer, sizeof(buffer), 0, (struct sockaddr *)&saddr, sizeof(saddr)) < 0) | 62 | if(sendto(sock, buffer, sizeof(buffer), 0, (struct sockaddr *)&saddr, sizeof(saddr)) < 0) |
63 | { | 63 | { |
64 | wl_logerr("Cannot write to socket: %s", strerror(errno)); | 64 | wl_logerr("Cannot write to socket: %s", strerror(errno)); |
65 | close(sock); | 65 | close(sock); |
66 | return 0; | 66 | return 0; |
67 | } | 67 | } |
68 | 68 | ||
69 | if(close(sock) < 0) | 69 | if(close(sock) < 0) |
70 | wl_logerr("Cannot close socket: %s", strerror(errno)); | 70 | wl_logerr("Cannot close socket: %s", strerror(errno)); |
71 | 71 | ||
72 | return 1; | 72 | return 1; |
73 | } | 73 | } |
74 | |||
75 | /* Check for new messages on commsock */ | ||
76 | int recvcomm(int *sock, char *out, int maxlen) | ||
77 | { | ||
78 | struct sockaddr_in *cliaddr; | ||
79 | socklen_t len=sizeof(struct sockaddr); | ||
80 | char buffer[128], retval[3]; | ||
81 | |||
82 | memset(buffer, 0, sizeof(buffer)); | ||
83 | if(recvfrom(*sock, buffer, sizeof(buffer)-1, 0, (struct sockaddr *)cliaddr, &len) < 0) | ||
84 | return -1; | ||
85 | |||
86 | memset(out, 0, maxlen); | ||
87 | memcpy(out, buffer, maxlen - 1); | ||
88 | |||
89 | memset(retval, 0, sizeof(retval)); | ||
90 | memcpy(retval, out, 2); | ||
91 | |||
92 | return atoi(retval); | ||
93 | } | ||
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/sock.hh b/noncore/net/wellenreiter/libwellenreiter/source/sock.hh index afde641..611e335 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/sock.hh +++ b/noncore/net/wellenreiter/libwellenreiter/source/sock.hh | |||
@@ -12,8 +12,9 @@ | |||
12 | #include <unistd.h> | 12 | #include <unistd.h> |
13 | #include <stdlib.h> | 13 | #include <stdlib.h> |
14 | #include <errno.h> | 14 | #include <errno.h> |
15 | 15 | ||
16 | int commsock(const char *, int); | 16 | int commsock(const char *, int); |
17 | int sendcomm(const char *, int, const char *, ...); | 17 | int sendcomm(const char *, int, const char *, ...); |
18 | int recvcomm(int *, char *, int); | ||
18 | 19 | ||
19 | #endif /* WLSOCK_HH */ | 20 | #endif /* WLSOCK_HH */ |