nortti
/
ethermess
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Start working on file sending

This commit is contained in:
Juhani Krekelä 2019-08-04 11:16:19 +03:00
parent ea2523e263
commit 9a2efcce2e
2 changed files with 56 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
ethermess-backend.c
View File

@ -22,7 +22,7 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#define EM_PROTOCOL_VERSION 0 #define EM_PROTOCOL_VERSION 1
#define EM_MESSAGE_MAX_LENGTH (1500 - 2 - 2 - 2) #define EM_MESSAGE_MAX_LENGTH (1500 - 2 - 2 - 2)
#define EM_STATUS_BROADCAST_TIME (60 * 1000 + 1000 * random_byte() / 64) #define EM_STATUS_BROADCAST_TIME (60 * 1000 + 1000 * random_byte() / 64)
#define EM_RETRANSMIT_TIME (1000 + random_byte() * 2) #define EM_RETRANSMIT_TIME (1000 + random_byte() * 2)
@ -37,6 +37,9 @@
#define EMT_MESSAGE 5 #define EMT_MESSAGE 5
#define EMT_ACK 6 #define EMT_ACK 6
// Version 1
#define EMT_FILE_OFFER 7
#define EMS_AVAILABLE 0 #define EMS_AVAILABLE 0
#define EMS_UNAVAILABLE 1 #define EMS_UNAVAILABLE 1
#define EMS_OFFLINE 2 #define EMS_OFFLINE 2
@ -395,6 +398,14 @@ void send_ack(const unsigned char destination[6], uint16_t msgid) {
send_frame(frame, sizeof(frame)); send_frame(frame, sizeof(frame));
} }
void send_file_offer(const unsigned char destination[6]) {
unsigned char frame[14 + 2];
write_headers(frame, destination, 1, EMT_FILE_OFFER);
send_frame(frame, sizeof(frame));
}
void readallx(int fd, unsigned char *buf, size_t length) { void readallx(int fd, unsigned char *buf, size_t length) {
size_t completed = 0; size_t completed = 0;
while (completed < length) { while (completed < length) {
@ -496,6 +507,10 @@ void read_command(void) {
send_status(broadcast_mac); send_status(broadcast_mac);
} else if (cmd == 'm') { } else if (cmd == 'm') {
read_message(); read_message();
} else if (cmd == 'f') {
unsigned char mac[6];
readallx(0, mac, sizeof(mac));
send_file_offer(mac);
} else { } else {
errx(1, "Frontend sent an unknown command %c", cmd); errx(1, "Frontend sent an unknown command %c", cmd);
} }
@ -867,35 +882,43 @@ void process_frame(void) {
// Extract Ethermess packet type // Extract Ethermess packet type
unsigned char packet_type = frame[15]; unsigned char packet_type = frame[15];
// Process the packet based on the packet type // Process the packet based on the version and packet type
switch (packet_type) { if (version == 0) {
case EMT_STATUS_REQUEST: switch (packet_type) {
if (check_padding(&frame[16], 0, packet_length - 16)) { case EMT_STATUS_REQUEST:
send_status(source_mac); if (check_padding(&frame[16], 0, packet_length - 16)) {
} send_status(source_mac);
break; }
break;
case EMT_STATUS: case EMT_STATUS:
handle_status(source_mac, &frame[16], packet_length - 16); handle_status(source_mac, &frame[16], packet_length - 16);
break; break;
case EMT_MSGID_REQUEST: case EMT_MSGID_REQUEST:
if (check_padding(&frame[16], 0, packet_length - 16)) { if (check_padding(&frame[16], 0, packet_length - 16)) {
send_msgid(source_mac); send_msgid(source_mac);
} }
break; break;
case EMT_MSGID: case EMT_MSGID:
handle_msgid(source_mac, &frame[16], packet_length - 16); handle_msgid(source_mac, &frame[16], packet_length - 16);
break; break;
case EMT_MESSAGE: case EMT_MESSAGE:
handle_message(source_mac, &frame[16], packet_length - 16); handle_message(source_mac, &frame[16], packet_length - 16);
break; break;
case EMT_ACK: case EMT_ACK:
handle_ack(source_mac, &frame[16], packet_length - 16); handle_ack(source_mac, &frame[16], packet_length - 16);
break; break;
}
} else if (version == 1) {
switch (packet_type) {
case EMT_FILE_OFFER:
fprintf(stderr, "File offered\n"); //debg
break;
}
} }
} }

9
ethermess.py
View File

@ -208,6 +208,9 @@ def set_status_nick(backend, status, nick):
encoded = nick.encode('utf-8') encoded = nick.encode('utf-8')
writeall(backend, b's' + bytes([status.value, len(encoded)]) + encoded) writeall(backend, b's' + bytes([status.value, len(encoded)]) + encoded)
def send_file_offer(backend, mac):
writeall(backend, b'f' + mac)
def handle_user_command(backend, line): def handle_user_command(backend, line):
global own_nick, own_status global own_nick, own_status
global default_target_mac global default_target_mac
@ -290,13 +293,17 @@ def handle_user_command(backend, line):
# Set default target of messages # Set default target of messages
default_target_mac = mac_from_name(rest) default_target_mac = mac_from_name(rest)
elif command == '/sendfile':
# Send an offer to transmit the file
send_file_offer(backend, mac_from_name(rest))
elif command == '/quit': elif command == '/quit':
# Quit # Quit
return 'quit' return 'quit'
else: else:
# Display usage # Display usage
print('--- / <message>; /msg <target> <message>; /status [<target>]; /peers; /available; /unavailable; /nick [<nick>]; /target <target>; /quit') print('--- / <message>; /msg <target> <message>; /status [<target>]; /peers; /available; /unavailable; /nick [<nick>]; /target <target>; /sendfile <target>; /quit')
else: else:
# Send message # Send message