summaryrefslogtreecommitdiffstats
path: root/friendfinder
diff options
context:
space:
mode:
authorpatrick2010-01-15 20:43:10 +0100
committerpatrick2010-01-15 20:43:10 +0100
commit58b92c6598a0b24f2a8ab6575aa3f7b4383b2814 (patch)
tree2a50869a2fe97dd65ecca172ea09757c5110c397 /friendfinder
parentfile reader built in (currently not working)...few map bug fixed...msg_sender... (diff)
downloadfriendfinder-58b92c6598a0b24f2a8ab6575aa3f7b4383b2814.tar.gz
friendfinder-58b92c6598a0b24f2a8ab6575aa3f7b4383b2814.tar.xz
friendfinder-58b92c6598a0b24f2a8ab6575aa3f7b4383b2814.zip
added key read from file
Diffstat (limited to 'friendfinder')
-rw-r--r--friendfinder/gui.c2
-rw-r--r--friendfinder/key.pem1
-rw-r--r--friendfinder/msg_sender.c53
-rw-r--r--friendfinder/read_file.c45
-rw-r--r--friendfinder/read_file.h1
-rw-r--r--friendfinder/receiver.c2
6 files changed, 65 insertions, 39 deletions
diff --git a/friendfinder/gui.c b/friendfinder/gui.c
index 4582b20..659069a 100644
--- a/friendfinder/gui.c
+++ b/friendfinder/gui.c
@@ -127,7 +127,7 @@ static void on_options(void *data, Evas_Object *obj, void *event_info)
static void on_message(void *data, Evas_Object *obj, void *event_info)
{
- msg_text = elm_entry_entry_get(obj);
+ msg_text = elm_entry_entry_get(obj);
elm_entry_context_menu_clear(obj);
}
diff --git a/friendfinder/key.pem b/friendfinder/key.pem
new file mode 100644
index 0000000..17b16cb
--- /dev/null
+++ b/friendfinder/key.pem
@@ -0,0 +1 @@
+sdasndjasdasdasdknasdlasndaslkdna0da
diff --git a/friendfinder/msg_sender.c b/friendfinder/msg_sender.c
index 6cf2e76..da304bf 100644
--- a/friendfinder/msg_sender.c
+++ b/friendfinder/msg_sender.c
@@ -54,22 +54,26 @@ void set_txt_msg(char *msg)
if (msg != NULL && session != NULL)
{
prepare_msg(msg);
+ printf("done \n");
//send_message(session, msg);
}
else printf("MSG_SENDER: NULL value \n");
-
}
+//bekommt noch char** als return value
void prepare_msg(char *msg)
{
int len = strlen(msg);
int part_count = (strlen(msg) / 7); //division mit rest, wenn ich mich nicht irre => wird auf nächst kleinere zahl abgerundet! passt!
+ printf("part_count %i \n", part_count);
+ char *message = (char*) malloc(strlen(msg)*2);
+ message = msg;
if (len <= 7)
{
char *msg_parts[1];
msg_parts[0] = msg;
- return msg;
+ return msg_parts;
}
if (len > 7)
@@ -77,26 +81,40 @@ void prepare_msg(char *msg)
char **msg_parts = (char(*)[part_count]) malloc(sizeof(char) * part_count);
int i = 0;
- while (i < part_count)
+ while (i <= part_count)
{
- if (i < part_count - 1)
- {
- strncpy(msg_parts[i], msg, 7);
- msg = &msg +7; //FIXME
+ printf("while ( %i < %i ) \n", i, part_count);
+ if (i < part_count)
+ {
+ printf("if ( %i < %i ) \n", i, part_count);
+ strncpy(msg_parts[i], message, 7);
+ message = message + 7; //FIXME
printf("msg_parts[%i]: %s \n",i, msg_parts[i]);
}
- else if (i == part_count - 1)
+ else if (i == part_count)
{
- printf("%s \n", msg);
- strncpy(msg_parts[i], msg, strlen(msg));
+ printf("if ( %i == %i )", i, part_count);
+ strncpy(msg_parts[i], message, strlen(msg));
+ printf("msg_parts[%i]: %s \n",i, msg_parts[i]);
}
i++;
}
- for (int j = 0; j < part_count; j++)
- {
- printf("%i: %s \n", j, msg_parts[j]);
- }
- return msg;
+ //return msg;
+ }
+}
+
+void repair_msg(char* inc_msg, char *msg)
+{
+ int len = strlen(msg);
+
+ if (len == 7)
+ {
+ strcat(inc_msg, msg);
+ }
+ if (len < 7)
+ {
+ strcat(inc_msg, msg);
+ strcat(inc_msg, '\0');
}
}
@@ -121,10 +139,12 @@ void send_message(irc_session_t *session, char *msg)
void on_connect(irc_session_t * session, const char * event, const char * origin, const char ** params, unsigned int count)
{
+ char *_key = read_key();
+
irc_cmd_join(session, "#msg", NULL);
irc_cmd_msg(session, "#msg", "connected");
- BF_set_key(&key, 5, "abcde");
+ BF_set_key(&key, strlen(_key) - 1, _key);
}
void on_channel(irc_session_t * session, const char * event, const char * origin, const char ** params, unsigned int count)
@@ -170,3 +190,4 @@ void msg_main_loop(void *nicknames)
irc_run(session);
}
}
+
diff --git a/friendfinder/read_file.c b/friendfinder/read_file.c
index 8903a09..e213c04 100644
--- a/friendfinder/read_file.c
+++ b/friendfinder/read_file.c
@@ -3,27 +3,32 @@
char* read_key()
{
- FILE *fr; /* declare the file pointer */
-
-
- int n;
- long elapsed_seconds;
- char line[200];
- //clrscr();
-
- fr = fopen ("elapsed.dta", "rt"); /* open the file for reading */
- /* elapsed.dta is the name of the file */
- /* "rt" means open the file for reading text */
+ FILE *fr;
+ int key_value;
+ char key_string;
+ char key[300]; //supports max. key length of 300 chars!
+ int i = 0;
- while(fgets(line, 200, fr) != NULL)
- {
- /* get a line, up to 80 chars from fr. done if NULL */
- sscanf(line, "%ld", &elapsed_seconds);
- /* convert the string to a long int */
-// printf ("%ld\n", elapsed_seconds);
- }
- fclose(fr); /* close the file prior to exiting the routine */
+ fr = fopen ("key.pem", "rt");
+
+ if (fr == NULL)
+ {
+ printf("READ_FILE: key could not have been read \n");
+ return NULL;
+ }
+
+ if (fr != NULL)
+ {
+ while((key_value = fgetc(fr)) != EOF)
+ {
+ key_string = (char) key_value;
+ key[i] = key_string;
+ i++;
+ }
+ }
+
+ fclose(fr);
- return line;
+ return key;
}
diff --git a/friendfinder/read_file.h b/friendfinder/read_file.h
index ded9e2b..a520f76 100644
--- a/friendfinder/read_file.h
+++ b/friendfinder/read_file.h
@@ -2,6 +2,5 @@
#define __READ_FILE_H_
char* read_key();
-
#endif
diff --git a/friendfinder/receiver.c b/friendfinder/receiver.c
index 7033c9b..f92b3d2 100644
--- a/friendfinder/receiver.c
+++ b/friendfinder/receiver.c
@@ -2,7 +2,7 @@
#include <stdio.h>
#include <string.h>
#include <stdint.h>
-#include <libircclient/libircclient.h>
+#include <libircclient.h>
#include "openssl/blowfish.h"
#include "draw_user.h"