github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-20 21:43:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Takion Init

Browse source
This commit is contained in:
Florian Märkl 2018-11-21 23:14:52 +01:00
commit 932be97520
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
3 changed files with 79 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/include/chiaki/takion.h
View file

@ -36,6 +36,8 @@ typedef struct chiaki_takion_t
int sock; int sock;
ChiakiThread thread; ChiakiThread thread;
int stop_pipe[2]; int stop_pipe[2];
uint32_t tag_local;
uint32_t tag_remote;
} ChiakiTakion; } ChiakiTakion;
CHIAKI_EXPORT ChiakiErrorCode chiaki_takion_connect(ChiakiTakion *takion, ChiakiLog *log, struct sockaddr *sa, socklen_t sa_len); CHIAKI_EXPORT ChiakiErrorCode chiaki_takion_connect(ChiakiTakion *takion, ChiakiLog *log, struct sockaddr *sa, socklen_t sa_len);

12
lib/src/session.c
View file

@ -157,10 +157,16 @@ static void *session_thread_func(void *arg)
struct sockaddr *sa = malloc(session->connect_info.host_addrinfo_selected->ai_addrlen); struct sockaddr *sa = malloc(session->connect_info.host_addrinfo_selected->ai_addrlen);
memcpy(sa, session->connect_info.host_addrinfo_selected->ai_addr, session->connect_info.host_addrinfo_selected->ai_addrlen); memcpy(sa, session->connect_info.host_addrinfo_selected->ai_addr, session->connect_info.host_addrinfo_selected->ai_addrlen);
if(sa->sa_family == AF_INET) if(sa->sa_family == AF_INET)
((struct sockaddr_in *)sa)->sin_port = 9297; ((struct sockaddr_in *)sa)->sin_port = htons(9297);
else if(sa->sa_family == AF_INET6) else if(sa->sa_family == AF_INET6)
((struct sockaddr_in6 *)sa)->sin6_port = 9297; ((struct sockaddr_in6 *)sa)->sin6_port = htons(9297);
chiaki_takion_connect(&session->takion, &session->log, sa, session->connect_info.host_addrinfo_selected->ai_addrlen); else
CHIAKI_LOGE(&session->log, "wtf\n");
err = chiaki_takion_connect(&session->takion, &session->log, sa, session->connect_info.host_addrinfo_selected->ai_addrlen);
if(err != CHIAKI_ERR_SUCCESS)
{
CHIAKI_LOGE(&session->log, "Senkusha connect failed\n");
}
free(sa); free(sa);
CHIAKI_LOGI(&session->log, "Senkusha started\n"); CHIAKI_LOGI(&session->log, "Senkusha started\n");

79
lib/src/takion.c
View file

@ -67,6 +67,10 @@ typedef struct takion_message_payload_init_ack_t
static void *takion_thread_func(void *user); static void *takion_thread_func(void *user);
static void takion_handle_packet(ChiakiTakion *takion, uint8_t *buf, size_t buf_size);
static void takion_handle_packet_message(ChiakiTakion *takion, uint8_t *buf, size_t buf_size);
static ChiakiErrorCode takion_send_message_init(ChiakiTakion *takion, TakionMessagePayloadInit *payload);
CHIAKI_EXPORT ChiakiErrorCode chiaki_takion_connect(ChiakiTakion *takion, ChiakiLog *log, struct sockaddr *sa, socklen_t sa_len) CHIAKI_EXPORT ChiakiErrorCode chiaki_takion_connect(ChiakiTakion *takion, ChiakiLog *log, struct sockaddr *sa, socklen_t sa_len)
{ {
@ -74,6 +78,9 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_takion_connect(ChiakiTakion *takion, Chiaki
takion->log = log; takion->log = log;
takion->tag_local = 0x4823; // "random" tag
takion->tag_remote = 0;
CHIAKI_LOGI(takion->log, "Takion connecting\n"); CHIAKI_LOGI(takion->log, "Takion connecting\n");
int r = pipe(takion->stop_pipe); int r = pipe(takion->stop_pipe);
@ -112,8 +119,20 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_takion_connect(ChiakiTakion *takion, Chiaki
goto error_sock; goto error_sock;
} }
uint8_t init_test_packet[] = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x14\x00\x00H#\x00\x01\x90\x00\x00d\x00d\x00\x00H#";
chiaki_takion_send(takion, init_test_packet, sizeof(init_test_packet)); TakionMessagePayloadInit init_payload;
init_payload.tag0 = takion->tag_local;
init_payload.something = 0x19000; // TODO: find out what this exactly is
init_payload.min = 0x64; // TODO: find out what this exactly is
init_payload.max = 0x64; // TODO: find out what this exactly is
init_payload.tag1 = takion->tag_remote;
r = takion_send_message_init(takion, &init_payload);
if(r != CHIAKI_ERR_SUCCESS)
{
ret = r;
goto error_sock;
}
return CHIAKI_ERR_SUCCESS; return CHIAKI_ERR_SUCCESS;
@ -143,13 +162,15 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_takion_send(ChiakiTakion *takion, uint8_t *
CHIAKI_LOGD(takion->log, "Takion send failed\n"); CHIAKI_LOGD(takion->log, "Takion send failed\n");
return CHIAKI_ERR_NETWORK; return CHIAKI_ERR_NETWORK;
} }
else
{
CHIAKI_LOGD(takion->log, "Takion sent %lu\n", r);
}
return CHIAKI_ERR_SUCCESS; return CHIAKI_ERR_SUCCESS;
} }
static void takion_handle_packet(ChiakiTakion *takion, uint8_t *buf, size_t buf_size);
static void takion_handle_packet_message(ChiakiTakion *takion, uint8_t *buf, size_t buf_size);
static void *takion_thread_func(void *user) static void *takion_thread_func(void *user)
{ {
@ -163,17 +184,17 @@ static void *takion_thread_func(void *user)
FD_SET(takion->sock, &fds); FD_SET(takion->sock, &fds);
FD_SET(takion->stop_pipe[1], &fds); FD_SET(takion->stop_pipe[1], &fds);
CHIAKI_LOGD(takion->log, "Takion select\n"); int nfds = takion->sock;
if(takion->stop_pipe[1] > nfds)
int r = select(1, &fds, NULL, NULL, NULL); nfds = takion->stop_pipe[1];
nfds++;
int r = select(nfds, &fds, NULL, NULL, NULL);
if(r < 0) if(r < 0)
{ {
CHIAKI_LOGE(takion->log, "Takion select failed: %s\n", strerror(errno)); CHIAKI_LOGE(takion->log, "Takion select failed: %s\n", strerror(errno));
break; break;
} }
CHIAKI_LOGD(takion->log, "Takion select returned\n");
if(FD_ISSET(takion->sock, &fds)) if(FD_ISSET(takion->sock, &fds))
{ {
uint8_t buf[1500]; uint8_t buf[1500];
@ -216,10 +237,11 @@ static void takion_handle_packet(ChiakiTakion *takion, uint8_t *buf, size_t buf_
} }
} }
#define MESSAGE_HEADER_SIZE 0x10
static void takion_handle_packet_message(ChiakiTakion *takion, uint8_t *buf, size_t buf_size) static void takion_handle_packet_message(ChiakiTakion *takion, uint8_t *buf, size_t buf_size)
{ {
if(buf_size < 0x10) if(buf_size < MESSAGE_HEADER_SIZE)
{ {
CHIAKI_LOGE(takion->log, "Takion message received that is too short\n"); CHIAKI_LOGE(takion->log, "Takion message received that is too short\n");
return; return;
@ -229,7 +251,7 @@ static void takion_handle_packet_message(ChiakiTakion *takion, uint8_t *buf, siz
msg.tag = htonl(*((uint32_t *)buf)); msg.tag = htonl(*((uint32_t *)buf));
msg.key_pos = htonl(*((uint32_t *)(buf + 0x8))); msg.key_pos = htonl(*((uint32_t *)(buf + 0x8)));
msg.type_a = buf[0xc]; msg.type_a = buf[0xc];
msg.type_a = buf[0xd]; msg.type_b = buf[0xd];
msg.payload_size = htons(*((uint16_t *)(buf + 0xe))); msg.payload_size = htons(*((uint16_t *)(buf + 0xe)));
if(buf_size != msg.payload_size + 0xc) if(buf_size != msg.payload_size + 0xc)
@ -248,3 +270,38 @@ static void takion_handle_packet_message(ChiakiTakion *takion, uint8_t *buf, siz
CHIAKI_LOGI(takion->log, "Takion received message with tag %#x, key pos %#x, type (%#x, %#x), payload size %#x, payload:\n", msg.tag, msg.key_pos, msg.type_a, msg.type_b, msg.payload_size); CHIAKI_LOGI(takion->log, "Takion received message with tag %#x, key pos %#x, type (%#x, %#x), payload size %#x, payload:\n", msg.tag, msg.key_pos, msg.type_a, msg.type_b, msg.payload_size);
chiaki_log_hexdump(takion->log, CHIAKI_LOG_INFO, msg.payload, msg.payload_size); chiaki_log_hexdump(takion->log, CHIAKI_LOG_INFO, msg.payload, msg.payload_size);
} }
/**
* Write a Takion message header of size MESSAGE_HEADER_SIZE to buf.
*
* This includes type_a, type_b and payload_size
*
* @param raw_payload_size size of the actual data of the payload excluding type_a, type_b and payload_size
*/
static void takion_write_message_header(uint8_t *buf, uint32_t tag, uint32_t key_pos, uint8_t type_a, uint8_t type_b, size_t payload_data_size)
{
*((uint32_t *)(buf + 0)) = htonl(tag);
*((uint32_t *)(buf + 4)) = 0;
*((uint32_t *)(buf + 8)) = htonl(key_pos);
*(buf + 0xc) = type_a;
*(buf + 0xd) = type_b;
*((uint16_t *)(buf + 0xe)) = htons((uint16_t)(payload_data_size + 4));
}
static ChiakiErrorCode takion_send_message_init(ChiakiTakion *takion, TakionMessagePayloadInit *payload)
{
uint8_t message[1 + MESSAGE_HEADER_SIZE + 0x10];
message[0] = TAKION_PACKET_TYPE_MESSAGE;
takion_write_message_header(message + 1, takion->tag_remote, 0, 1, 0, 0x10);
uint8_t *pl = message + 1 + MESSAGE_HEADER_SIZE;
*((uint32_t *)(pl + 0)) = htonl(payload->tag0);
*((uint32_t *)(pl + 4)) = htonl(payload->something);
*((uint16_t *)(pl + 8)) = htons(payload->min);
*((uint16_t *)(pl + 0xa)) = htons(payload->max);
*((uint32_t *)(pl + 0xc)) = htonl(payload->tag1);
return chiaki_takion_send(takion, message, sizeof(message));
}