diff options
| author |  Gediminas Jakutis <gediminas@varciai.lt>
| 2019-05-29 13:07:28 +0300 |
|---|---|---|
| committer | Gediminas Jakutis <gediminas@varciai.lt>
| 2019-05-29 13:07:28 +0300 |
| commit | 96d7d31534921889c219a5c9e00a46c3e94d0124 (patch) | |
| tree | 99ec8522ea1eecc8e79912b28272d3cb31d8c886 /include | |
| parent | a7c5c9ed96462d1b28139c04fba679403a412164 (diff) | |
| parent | 187fe61700fc97fff565ec53aac65c664042feae (diff) | |
| download | usurpation-96d7d31534921889c219a5c9e00a46c3e94d0124.tar.gz usurpation-96d7d31534921889c219a5c9e00a46c3e94d0124.tar.bz2 usurpation-96d7d31534921889c219a5c9e00a46c3e94d0124.zip | |
Merge branch 'net_improvements'
NOTE: this removes the adhoc discovery implementation.
If working discovery is required either use an earlier version or
whicherver later version that hopefully implements it.
Signed-off-by: Gediminas Jakutis <gediminas@varciai.lt>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net.h | 14 | ||||
| -rw-r--r-- | include/settings.h | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/include/net.h b/include/net.h index e4ca0a6..8385943 100644 --- a/include/net.h +++ b/include/net.h @@ -22,6 +22,13 @@ #ifndef USURPATION_NET_H_INCLUDED #define USURPATION_NET_H_INCLUDED +#ifdef unix +#include <sys/socket.h> +#include <netinet/in.h> +#endif + +#include <stddef.h> + #define MTU 1500 enum response { @@ -29,8 +36,6 @@ enum response { A_OK = 0, /* would be "OK", but clashes with some lib definitions */ NONEWDATA, DEAD, - NO_ESPTOOL, - TMPFILE, }; /** @@ -49,5 +54,10 @@ int net_close(int nd); * and needs to be free()'d later. Otherwise, the supplied buffer is reused. */ int net_getlastdata(int nd, char ** const data); +int net_send(int nd, const char * const buf, size_t buf_size); + +#ifdef unix +int net_send_addr(int nd, const char * const buf, size_t buf_size, const struct sockaddr_in * const addr); +#endif #endif /* USURPATION_NET_H_INCLUDED */ diff --git a/include/settings.h b/include/settings.h index e2e9644..538c7fd 100644 --- a/include/settings.h +++ b/include/settings.h @@ -26,7 +26,7 @@ enum verbosity { SILENT = 0, ERR = 1, WARN, - DEBUG, + INFO, ALL }; |