From a3a0e553f3f06cf97d58347901fd478db81d571b Mon Sep 17 00:00:00 2001 From: iphydf Date: Fri, 2 Feb 2018 17:40:00 +0000 Subject: Move irc_syncbot to the toxins repository. --- CMakeLists.txt | 5 - INSTALL.md | 1 - testing/BUILD.bazel | 9 -- testing/Makefile.inc | 13 -- testing/irc_syncbot.c | 383 -------------------------------------------------- 5 files changed, 411 deletions(-) delete mode 100644 testing/irc_syncbot.c diff --git a/CMakeLists.txt b/CMakeLists.txt index d302573c..4a029e14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -585,8 +585,3 @@ if(UTIL_LIBRARIES) add_executable(tox_shell testing/tox_shell.c) target_link_modules(tox_shell toxcore ${UTIL_LIBRARIES}) endif() - -if(NOT WIN32) - add_executable(irc_syncbot testing/irc_syncbot.c) - target_link_modules(irc_syncbot toxcore toxnetwork) -endif() diff --git a/INSTALL.md b/INSTALL.md index a13bf991..efd5d383 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -47,7 +47,6 @@ There are some testing programs that you might find interesting. Note that they | Name | Type | Dependencies | Platform | Description | |-------------|------------|------------------------|-----------|-----------------------------------------------------------------------------------------------------------------------------------------| -| irc_syncbot | Executable | libtoxcore | Unix-like | Bot that synchronizes an IRC channel and a Tox group chat (conference). | | tox_shell | Executable | libtoxcore, libutil | Unix-like | Proof of concept SSH-like server software using Tox. Testing program, not intended for actual use. | There are also some programs that are not plugged into the CMake build system which you might find interesting. You would need to build those programs yourself. These programs reside in [`other/fun`](other/fun) directory. diff --git a/testing/BUILD.bazel b/testing/BUILD.bazel index ee97fd1f..1413acc9 100644 --- a/testing/BUILD.bazel +++ b/testing/BUILD.bazel @@ -43,15 +43,6 @@ cc_binary( ], ) -cc_binary( - name = "irc_syncbot", - srcs = ["irc_syncbot.c"], - deps = [ - ":misc_tools", - "//c-toxcore/toxcore", - ], -) - cc_binary( name = "tox_shell", srcs = ["tox_shell.c"], diff --git a/testing/Makefile.inc b/testing/Makefile.inc index b489a701..7d5b41e7 100644 --- a/testing/Makefile.inc +++ b/testing/Makefile.inc @@ -51,19 +51,6 @@ tox_shell_LDADD = $(LIBSODIUM_LDFLAGS) \ -lutil -noinst_PROGRAMS += irc_syncbot - -irc_syncbot_SOURCES = ../testing/irc_syncbot.c - -irc_syncbot_CFLAGS = $(LIBSODIUM_CFLAGS) \ - $(NACL_CFLAGS) - -irc_syncbot_LDADD = $(LIBSODIUM_LDFLAGS) \ - $(NACL_LDFLAGS) \ - libtoxcore.la \ - $(LIBSODIUM_LIBS) \ - $(NACL_OBJECTS) \ - $(NACL_LIBS) endif EXTRA_DIST += $(top_srcdir)/testing/misc_tools.c diff --git a/testing/irc_syncbot.c b/testing/irc_syncbot.c deleted file mode 100644 index 329dfb85..00000000 --- a/testing/irc_syncbot.c +++ /dev/null @@ -1,383 +0,0 @@ -#define _XOPEN_SOURCE 600 - -#include -#include -#include -#include -#include - - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__MACH__) -#define MSG_NOSIGNAL 0 -#endif - -#if defined(__FreeBSD__) && !defined(MSG_NOSIGNAL) -#define MSG_NOSIGNAL 0x20000 // only defined on FreeBSD for some __POSIX_VISIBLE, causes compilation failures -#endif - -//IRC name and channel. -#define IRC_NAME "Tox_syncbot" -#define IRC_CHANNEL "#tox-real-ontopic" - -//IRC server ip and port. -static uint8_t ip[4] = {127, 0, 0, 1}; -static uint16_t port = 6667; - -#define SILENT_TIMEOUT 20 - -static int sock; - -#define SERVER_CONNECT "NICK " IRC_NAME "\nUSER " IRC_NAME " 8 * :" IRC_NAME "\n" -#define CHANNEL_JOIN "JOIN " IRC_CHANNEL "\n" - -/* In toxcore/network.c */ -uint64_t current_time_monotonic(void); - -static uint64_t get_monotime_sec(void) -{ - return current_time_monotonic() / 1000; -} - -static int reconnect(void) -{ - int new_sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - - if (new_sock < 0) { - printf("error socket\n"); - return -1; - } - - struct sockaddr_storage addr = {0}; - - size_t addrsize; - - struct sockaddr_in *addr4 = (struct sockaddr_in *)&addr; - - addrsize = sizeof(struct sockaddr_in); - - addr4->sin_family = AF_INET; - - memcpy(&addr4->sin_addr, ip, 4); - - addr4->sin_port = htons(port); - - if (connect(new_sock, (struct sockaddr *)&addr, addrsize) != 0) { - printf("error connect\n"); - close(new_sock); - return -1; - } - - send(new_sock, SERVER_CONNECT, sizeof(SERVER_CONNECT) - 1, MSG_NOSIGNAL); - - return new_sock; -} - -#include "../toxcore/ccompat.h" -#include "../toxcore/tox.h" -#include "misc_tools.c" - -static int current_group = -1; - -static void callback_group_invite(Tox *tox, uint32_t fid, TOX_CONFERENCE_TYPE type, const uint8_t *data, size_t length, - void *userdata) -{ - if (current_group == -1) { - current_group = tox_conference_join(tox, fid, data, length, nullptr); - } -} - -static void callback_friend_message(Tox *tox, uint32_t fid, TOX_MESSAGE_TYPE type, const uint8_t *message, - size_t length, - void *userdata) -{ - if (length == 1 && *message == 'c') { - if (tox_conference_delete(tox, current_group, nullptr) == 0) { - current_group = -1; - } - } - - if (length == 1 && *message == 'i') { - tox_conference_invite(tox, fid, current_group, nullptr); - } - - if (length == 1 && *message == 'j' && sock >= 0) { - send(sock, CHANNEL_JOIN, sizeof(CHANNEL_JOIN) - 1, MSG_NOSIGNAL); - } -} - -static void copy_groupmessage(Tox *tox, uint32_t groupnumber, uint32_t friendgroupnumber, TOX_MESSAGE_TYPE type, - const uint8_t *message, size_t length, - void *userdata) -{ - if (tox_conference_peer_number_is_ours(tox, groupnumber, friendgroupnumber, nullptr)) { - return; - } - - TOX_ERR_CONFERENCE_PEER_QUERY error; - size_t namelen = tox_conference_peer_get_name_size(tox, groupnumber, friendgroupnumber, &error); - uint8_t name[TOX_MAX_NAME_LENGTH]; - tox_conference_peer_get_name(tox, groupnumber, friendgroupnumber, name, nullptr); - - if (namelen == 0 || error != TOX_ERR_CONFERENCE_PEER_QUERY_OK) { - memcpy(name, "", 9); - namelen = 9; - } - - uint8_t sendbuf[2048]; - uint16_t send_len = 0; - - memcpy(sendbuf, "PRIVMSG " IRC_CHANNEL " :", sizeof("PRIVMSG " IRC_CHANNEL " :")); - send_len += sizeof("PRIVMSG " IRC_CHANNEL " :") - 1; - memcpy(sendbuf + send_len, name, namelen); - send_len += namelen; - sendbuf[send_len] = ':'; - send_len += 1; - sendbuf[send_len] = ' '; - send_len += 1; - memcpy(sendbuf + send_len, message, length); - send_len += length; - unsigned int i; - - for (i = 0; i < send_len; ++i) { - if (sendbuf[i] == '\n') { - sendbuf[i] = '|'; - } - - if (sendbuf[i] == 0) { - sendbuf[i] = ' '; - } - } - - sendbuf[send_len] = '\n'; - send_len += 1; - - if (sock >= 0) { - send(sock, sendbuf, send_len, MSG_NOSIGNAL); - } -} - -static void send_irc_group(Tox *tox, uint8_t *msg, uint16_t len) -{ - if (len > 1350 || len == 0 || len == 1) { - return; - } - - --len; - - if (*msg != ':') { - return; - } - - VLA(uint8_t, req, len); - unsigned int i; - - unsigned int spaces = 0; - - for (i = 0; i < (len - 1); ++i) { - if (msg[i + 1] == ' ') { - ++spaces; - } else { - if (spaces >= 3 && msg[i + 1] == ':') { - break; - } - } - - req[i] = msg[i + 1]; - } - - unsigned int req_len = i; - req[i] = 0; - - VLA(uint8_t, message, len); - uint16_t length = 0; - - uint8_t *pmsg = (uint8_t *)strstr((char *)req, " PRIVMSG"); - - if (pmsg == nullptr) { - return; - } - - uint8_t *dt; - - for (dt = req, i = 0; dt != pmsg && *dt != '!'; ++dt, ++i) { - message[i] = *dt; - ++length; - } - - message[length] = ':'; - length += 1; - message[length] = ' '; - length += 1; - - if ((req_len + 2) >= len) { - return; - } - - memcpy(message + length, msg + req_len + 2, len - (req_len + 2)); - length += len - (req_len + 2); - tox_conference_send_message(tox, current_group, TOX_MESSAGE_TYPE_NORMAL, message, length, nullptr); -} - -static Tox *init_tox(int argc, char *argv[]) -{ - uint8_t ipv6enabled = 1; /* x */ - int argvoffset = cmdline_parsefor_ipv46(argc, argv, &ipv6enabled); - - if (argvoffset < 0) { - exit(1); - } - - /* with optional --ipvx, now it can be 1-4 arguments... */ - if ((argc != argvoffset + 2) && (argc != argvoffset + 4)) { - printf("Usage: %s [--ipv4|--ipv6] ip port public_key (of the DHT bootstrap node)\n", argv[0]); - exit(0); - } - - Tox *tox = tox_new(0, 0); - - if (!tox) { - exit(1); - } - - tox_self_set_name(tox, (const uint8_t *)IRC_NAME, sizeof(IRC_NAME) - 1, 0); - tox_callback_friend_message(tox, &callback_friend_message); - tox_callback_conference_invite(tox, &callback_group_invite); - tox_callback_conference_message(tox, ©_groupmessage); - - char temp_id[128]; - printf("\nEnter the address of irc_syncbots master (38 bytes HEX format):\n"); - - if (scanf("%s", temp_id) != 1) { - exit(1); - } - - uint16_t bootstrap_port = atoi(argv[argvoffset + 2]); - unsigned char *binary_string = hex_string_to_bin(argv[argvoffset + 3]); - tox_bootstrap(tox, argv[argvoffset + 1], bootstrap_port, binary_string, 0); - free(binary_string); - - uint8_t *bin_id = hex_string_to_bin(temp_id); - uint32_t num = tox_friend_add(tox, bin_id, (const uint8_t *)"Install Gentoo", sizeof("Install Gentoo") - 1, 0); - free(bin_id); - - if (num == UINT32_MAX) { - printf("\nSomething went wrong when adding friend.\n"); - exit(1); - } - - return tox; -} - -int main(int argc, char *argv[]) -{ - Tox *tox = init_tox(argc, argv); - - sock = reconnect(); - - if (sock < 0) { - return 1; - } - - uint64_t last_get = get_monotime_sec(); - int connected = 0, ping_sent = 0; - - while (1) { - int count = 0; - ioctl(sock, FIONREAD, &count); - - if (count > 0) { - last_get = get_monotime_sec(); - ping_sent = 0; - uint8_t *data = (uint8_t *)calloc(count + 1, 1); - recv(sock, data, count, MSG_NOSIGNAL); - printf("%s", data); - - if (!connected) { - connected = 1; - } - - if (count > 6 && data[0] == 'P' && data[1] == 'I' && data[2] == 'N' && data[3] == 'G') { - data[1] = 'O'; - unsigned int i; - - for (i = 0; i < count; ++i) { - if (data[i] == '\n') { - ++i; - break; - } - } - - send(sock, data, i, MSG_NOSIGNAL); - } - - unsigned int i, p_i = 0; - - for (i = 1; data[0] == ':' && i < count; ++i) { - if (data[i] == ' ') { - if (i + 5 < count && memcmp(data + i, " 404 ", 5) == 0) { - connected = 1; - } - - break; - } - - if (data[i] == ':') { - break; - } - } - - for (i = 0; i < count; ++i) { - if (data[i] == '\n' && i != 0) { - send_irc_group(tox, data + p_i, i - p_i); - p_i = i + 1; - } - } - - free(data); - } - - if (connected == 1) { - send(sock, CHANNEL_JOIN, sizeof(CHANNEL_JOIN) - 1, MSG_NOSIGNAL); - connected = 2; - } - - if (!ping_sent && last_get + (SILENT_TIMEOUT / 2) < get_monotime_sec()) { - unsigned int p_s = sizeof("PING :test\n") - 1; - - if (send(sock, "PING :test\n", p_s, MSG_NOSIGNAL) == p_s) { - ping_sent = 1; - } - } - - int error = 0; - socklen_t len = sizeof(error); - - if (sock < 0 || last_get + SILENT_TIMEOUT < get_monotime_sec() - || getsockopt(sock, SOL_SOCKET, SO_ERROR, &error, &len) != 0) { - close(sock); - printf("reconnect\n"); - sock = reconnect(); - - if (sock >= 0) { - last_get = get_monotime_sec(); - connected = 0; - ping_sent = 0; - } - } - - tox_iterate(tox, nullptr); - usleep(1000 * 50); - } -} -- cgit v1.2.3