summaryrefslogtreecommitdiffstats
path: root/friendfinder
diff options
context:
space:
mode:
authorPatrick Hornecker2010-02-08 17:37:20 +0100
committerPatrick Hornecker2010-02-08 17:37:20 +0100
commitbff241d3bf67916b66650da481cfe2654533bba0 (patch)
tree1b5f202b135501534db3050acefbd989572fbbcd /friendfinder
parentmissing change ;) (diff)
downloadfriendfinder-bff241d3bf67916b66650da481cfe2654533bba0.tar.gz
friendfinder-bff241d3bf67916b66650da481cfe2654533bba0.tar.xz
friendfinder-bff241d3bf67916b66650da481cfe2654533bba0.zip
key bugs...
Diffstat (limited to 'friendfinder')
-rwxr-xr-xfriendfinder/guibin197329 -> 201737 bytes
-rw-r--r--friendfinder/gui.c2
-rw-r--r--friendfinder/key.pem2
-rw-r--r--friendfinder/msg_sender.c9
-rw-r--r--friendfinder/read_file.c23
-rw-r--r--friendfinder/read_file.h8
-rw-r--r--friendfinder/receiver.c12
-rw-r--r--friendfinder/sender.c9
8 files changed, 43 insertions, 22 deletions
diff --git a/friendfinder/gui b/friendfinder/gui
index 1cce5cb..5a5630c 100755
--- a/friendfinder/gui
+++ b/friendfinder/gui
Binary files differ
diff --git a/friendfinder/gui.c b/friendfinder/gui.c
index 30153c6..6e9f057 100644
--- a/friendfinder/gui.c
+++ b/friendfinder/gui.c
@@ -237,7 +237,7 @@ static void on_send_message(void *data, Evas_Object *bx3, void *event_info)
void show_message(char *current_msg)
{
if (current_msg != NULL)
- {
+ {
if (first == 0 && enable_chat == 1)
{
bb = elm_bubble_add(bbx);
diff --git a/friendfinder/key.pem b/friendfinder/key.pem
index f3a7a66..5a638ca 100644
--- a/friendfinder/key.pem
+++ b/friendfinder/key.pem
@@ -1 +1 @@
-abcdefghijk
+dmwa09ddjsnodaisdnalksda0sdasdioasdnasdaäsldödaüpdskd0aßsdasdoisadnsd09as8dasda
diff --git a/friendfinder/msg_sender.c b/friendfinder/msg_sender.c
index 33e54cd..6f722c7 100644
--- a/friendfinder/msg_sender.c
+++ b/friendfinder/msg_sender.c
@@ -185,11 +185,16 @@ void send_message(irc_session_t *session, struct msg_part *msg_p)
void on_connect(irc_session_t * session, const char * event, const char * origin, const char ** params, unsigned int count)
{
- char *_key = read_key();
+ struct key_data *keyd = (struct key_data*) malloc(sizeof(struct key_data));
+ //keyd->key = (char*) malloc(sizeof(char) * 300);
+
+ keyd = read_key();
irc_cmd_join(session, "#msg", NULL);
irc_cmd_msg(session, "#msg", "connected");
- BF_set_key(&key, strlen(_key) - 1, _key);
+ printf("keyd->key %s :: keyd->key_length %i \n", keyd->key, keyd->key_length);
+
+ BF_set_key(&key, keyd->key_length - 1, keyd->key);
}
void on_channel(irc_session_t * session, const char * event, const char * origin, const char ** params, unsigned int count)
diff --git a/friendfinder/read_file.c b/friendfinder/read_file.c
index cdbf684..1ed9ec4 100644
--- a/friendfinder/read_file.c
+++ b/friendfinder/read_file.c
@@ -1,13 +1,17 @@
#include <stdlib.h>
#include <stdio.h>
+#include <string.h>
+#include "read_file.h"
-
-char* read_key()
+struct key_data* read_key()
{
- FILE *fr;
+ FILE *fr;
+
int key_value;
char key_string;
- char *key = (char(*)[300]) malloc(sizeof(char) * 300); //supports max keylength of 300
+
+ struct key_data *keyd = (struct key_data*) malloc(sizeof(struct key_data));
+ keyd->key = (char*) malloc(sizeof(char) * 300); //supports max keylength of 300
int i = 0;
fr = fopen ("key.pem", "rt");
@@ -23,14 +27,17 @@ char* read_key()
while((key_value = fgetc(fr)) != EOF)
{
key_string = (char) key_value;
- key[i] = key_string;
+ keyd->key[i] = key_string;
i++;
}
}
-
+ keyd->key[i] = '\0';
+ keyd->key_length = i - 1;
+
fclose(fr);
-
- return key;
+// printf("READ_KEY: %s \n", key);
+ printf("keyd->key %s :: keyd->key_length %i \n", keyd->key, keyd->key_length);
+ return keyd;
}
/*
void write_png(DmtxImage *img)
diff --git a/friendfinder/read_file.h b/friendfinder/read_file.h
index a520f76..5648ce2 100644
--- a/friendfinder/read_file.h
+++ b/friendfinder/read_file.h
@@ -1,6 +1,12 @@
#ifndef __READ_FILE_H_
#define __READ_FILE_H_
-char* read_key();
+struct key_data
+{
+ char *key;
+ int key_length;
+};
+
+struct key_data* read_key();
#endif
diff --git a/friendfinder/receiver.c b/friendfinder/receiver.c
index a33262c..8d27a89 100644
--- a/friendfinder/receiver.c
+++ b/friendfinder/receiver.c
@@ -154,8 +154,8 @@ void init_sender_struct(int number)
s_sender[i] = (struct sender*) malloc(sizeof(struct sender));
s_sender[i]->nick = (char*) malloc(sizeof(char) * 20);
- s_sender[i]->lat = (char*) malloc(sizeof(char) * 9);
- s_sender[i]->lon = (char*) malloc(sizeof(char) * 9);
+ s_sender[i]->lat = (char*) malloc(sizeof(char) * 8);
+ s_sender[i]->lon = (char*) malloc(sizeof(char) * 8);
s_sender[i]->is_init = (int) malloc(sizeof(int));
s_sender[i]->is_init = 0;
@@ -172,10 +172,12 @@ void on_connect_receiver(irc_session_t * session, const char * event, const char
{
printf("RECEIVER: on_connect_receiver \n");
- char *_key = read_key();
-
- BF_set_key(&key, strlen(_key) - 1, _key);
+ struct key_data *keyd = (struct key_data*) malloc(sizeof(struct key_data));
+ keyd->key = (char*) malloc(sizeof(char) * 300);
+ keyd = read_key();
+ BF_set_key(&key, keyd->key_length, keyd->key);
+
init_sender_struct(3);
irc_cmd_join(session, "#test", NULL);
diff --git a/friendfinder/sender.c b/friendfinder/sender.c
index 321d5e9..31d5b0d 100644
--- a/friendfinder/sender.c
+++ b/friendfinder/sender.c
@@ -70,11 +70,12 @@ void send_position(irc_session_t * session, const char * event, const char * ori
if (first_send == 0)
{
- char *_key = (char*) malloc(sizeof(char) * 300);
- _key = read_key();
-
- BF_set_key(&key, strlen(_key) - 1, _key);
+ struct key_data *keyd = (struct key_data*) malloc(sizeof(struct key_data));
+ keyd->key = (char*) malloc(sizeof(char) * 300);
+ keyd = read_key();
+ BF_set_key(&key, keyd->key_length, keyd->key);
+
irc_cmd_join(session, "#test", NULL);
irc_cmd_msg(session, "#test", "connected");