changing testing clients to reflect changes made in core/Messenger.h

This commit is contained in:
Peter Maatman 2013-07-30 17:10:20 +02:00
parent 12b19f6910
commit 2c756f1c53
2 changed files with 17 additions and 4 deletions

View File

@ -128,7 +128,7 @@ int main(int argc, char *argv[])
while(1) { while(1) {
uint8_t name[128]; uint8_t name[128];
getname(num, name); getfriendname(num, name);
printf("%s\n", name); printf("%s\n", name);
m_sendmessage(num, (uint8_t*)"Test", 5); m_sendmessage(num, (uint8_t*)"Test", 5);

View File

@ -88,6 +88,19 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
int num = atoi(numstring); int num = atoi(numstring);
if(m_sendmessage(num, (uint8_t*) message, sizeof(message)) != 1) { if(m_sendmessage(num, (uint8_t*) message, sizeof(message)) != 1) {
new_lines("[i] could not send message"); new_lines("[i] could not send message");
} else {
char name[MAX_NAME_LENGTH];
getname((uint8_t*)name);
char msg[100+strlen(message)+strlen(name)+1];
time_t rawtime;
struct tm * timeinfo;
time ( &rawtime );
timeinfo = localtime ( &rawtime );
char* time = asctime(timeinfo);
size_t len = strlen(time);
time[len-1]='\0';
sprintf(msg, "[%d] %s <%s> %s", num, time, name, message); // timestamp
new_lines(msg);
} }
} }
else if (line[1] == 'n') { else if (line[1] == 'n') {
@ -214,7 +227,7 @@ void print_request(uint8_t *public_key, uint8_t *data, uint16_t length)
void print_message(int friendnumber, uint8_t * string, uint16_t length) void print_message(int friendnumber, uint8_t * string, uint16_t length)
{ {
char name[MAX_NAME_LENGTH]; char name[MAX_NAME_LENGTH];
getname(friendnumber, (uint8_t*)name); getfriendname(friendnumber, (uint8_t*)name);
char msg[100+length+strlen(name)+1]; char msg[100+length+strlen(name)+1];
time_t rawtime; time_t rawtime;
struct tm * timeinfo; struct tm * timeinfo;
@ -229,7 +242,7 @@ void print_message(int friendnumber, uint8_t * string, uint16_t length)
void print_nickchange(int friendnumber, uint8_t *string, uint16_t length) { void print_nickchange(int friendnumber, uint8_t *string, uint16_t length) {
char name[MAX_NAME_LENGTH]; char name[MAX_NAME_LENGTH];
getname(friendnumber, (uint8_t*)name); getfriendname(friendnumber, (uint8_t*)name);
char msg[100+length]; char msg[100+length];
sprintf(msg, "[i] [%d] %s is now known as %s.", friendnumber, name, string); sprintf(msg, "[i] [%d] %s is now known as %s.", friendnumber, name, string);
new_lines(msg); new_lines(msg);
@ -237,7 +250,7 @@ void print_nickchange(int friendnumber, uint8_t *string, uint16_t length) {
void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) { void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) {
char name[MAX_NAME_LENGTH]; char name[MAX_NAME_LENGTH];
getname(friendnumber, (uint8_t*)name); getfriendname(friendnumber, (uint8_t*)name);
char msg[100+length+strlen(name)+1]; char msg[100+length+strlen(name)+1];
sprintf(msg, "[i] [%d] %s's status changed to %s.", friendnumber, name, string); sprintf(msg, "[i] [%d] %s's status changed to %s.", friendnumber, name, string);
new_lines(msg); new_lines(msg);