From 9eaae350070e4163dfb2695ac45878302832e3f3 Mon Sep 17 00:00:00 2001 From: Patrick Hornecker Date: Tue, 23 Feb 2010 22:14:07 +0100 Subject: tex source --- friendfinder/gui | Bin 484899 -> 484891 bytes friendfinder/msg_sender.c | 2 +- friendfinder/receiver.c | 13 +++++++++---- friendfinder/sender.c | 12 ++---------- 4 files changed, 12 insertions(+), 15 deletions(-) (limited to 'friendfinder') diff --git a/friendfinder/gui b/friendfinder/gui index 3188c24..97734c6 100755 Binary files a/friendfinder/gui and b/friendfinder/gui differ diff --git a/friendfinder/msg_sender.c b/friendfinder/msg_sender.c index 5e85ece..d643a66 100644 --- a/friendfinder/msg_sender.c +++ b/friendfinder/msg_sender.c @@ -209,7 +209,7 @@ void on_connect(irc_session_t * session, const char * event, const char * origin keyd = read_key(); irc_cmd_join(session, "#msg", NULL); - irc_cmd_msg(session, "#msg", "connected"); +// irc_cmd_msg(session, "#msg", "connected"); BF_set_key(&key, keyd->key_length , keyd->key); //BF_set_key(&key, sizeof(keyd->key), keyd->key); diff --git a/friendfinder/receiver.c b/friendfinder/receiver.c index 569981e..e1400ff 100644 --- a/friendfinder/receiver.c +++ b/friendfinder/receiver.c @@ -344,11 +344,16 @@ int check_message(char *msg) char* ack_decrypted = (char*) malloc(sizeof(char) * 20); from_base64(msg, strlen(msg), ack_base64, 50); - BF_ecb_encrypt(ack_decrypted, ack_base64, &key, BF_DECRYPT); - - if (strcmp(ack, ack_decrypted) == 0) + BF_ecb_encrypt(ack_base64, ack_decrypted, &key, BF_DECRYPT); + + if (strcmp(ack, ack_decrypted) == 0) + { return 1; - else return 0; + } + else if (strcmp(ack, ack_decrypted) != 0) + { + return 0; + } } void on_connect_receiver(irc_session_t * session, const char * event, const char * origin, const char ** params, unsigned int count) diff --git a/friendfinder/sender.c b/friendfinder/sender.c index a21b18f..4daeb33 100644 --- a/friendfinder/sender.c +++ b/friendfinder/sender.c @@ -227,17 +227,12 @@ void get_aknowledge(irc_session_t * session, const char * event, const char * or strcat(own_receiver_name, "_r"); from_base64(params[1], strlen(params[1]), ack_base64, 50); - printf("ack_base64 %s \n", ack_base64); BF_ecb_encrypt(ack_base64, ack, &key, BF_DECRYPT); - printf("ack %s \n", ack); - irc_target_get_nick(origin, sender_name, sizeof(sender_name)); - printf("sender_name %s username %s ack %s \n", sender_name, username, ack); - - if(strcmp(suffix_username, sender_name) != 0 && strcmp(ack, "ack") != 0 && strcmp(sender_name, own_receiver_name) != 0 && + if(strcmp(suffix_username, sender_name) != 0 && strcmp(ack, "ack") == 0 && strcmp(sender_name, own_receiver_name) != 0 && strcmp(sender_name, "_r") > 0) { @@ -252,7 +247,7 @@ void get_aknowledge(irc_session_t * session, const char * event, const char * or if (ack_count == 2 && msg_count == 0) { resend = 1; - + sleep(3); send_position(session, event, origin, params, count); @@ -279,9 +274,6 @@ void sender_main(void *user) if (init_connection_sender(sender_server_ip, suffix_username) == 0) { - printf("username %s \n", username); - printf("suffix_username %s \n", suffix_username); - printf("SENDER: connection succesfull...\n"); irc_run(session); } -- cgit v1.2.3-55-g7522