StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #341 from stal888/userstatus-ext

Browse Source 
An extension to user statuses.
This commit is contained in:
irungentoo 2013-08-05 17:24:04 -07:00
commit 109fe7bd0a
7 changed files with 126 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
core/Messenger.c
View File

@ -35,6 +35,7 @@ typedef struct {
uint8_t *userstatus;
uint16_t userstatus_length;
uint8_t userstatus_sent;
USERSTATUS_KIND userstatus_kind;
uint16_t info_size; /* length of the info */
} Friend;
@ -45,6 +46,7 @@ static uint16_t self_name_length;
static uint8_t *self_userstatus;
static uint16_t self_userstatus_len;
static USERSTATUS_KIND self_userstatus_kind;
#define MAX_NUM_FRIENDS 256
@ -123,6 +125,7 @@ int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length)
memcpy(friendlist[i].client_id, client_id, CLIENT_ID_SIZE);
friendlist[i].userstatus = calloc(1, 1);
friendlist[i].userstatus_length = 1;
friendlist[i].userstatus_kind = USERSTATUS_KIND_OFFLINE;
memcpy(friendlist[i].info, data, length);
friendlist[i].info_size = length;
@ -269,10 +272,13 @@ int getname(int friendnumber, uint8_t * name)
return 0;
}
int m_set_userstatus(uint8_t *status, uint16_t length)
int m_set_userstatus(USERSTATUS_KIND kind, uint8_t *status, uint16_t length)
{
if (length > MAX_USERSTATUS_LENGTH)
return -1;
if (kind != USERSTATUS_KIND_RETAIN) {
self_userstatus_kind = kind;
}
uint8_t *newstatus = calloc(length, 1);
memcpy(newstatus, status, length);
free(self_userstatus);
@ -285,6 +291,20 @@ int m_set_userstatus(uint8_t *status, uint16_t length)
return 0;
}
int m_set_userstatus_kind(USERSTATUS_KIND kind) {
if (kind >= USERSTATUS_KIND_INVALID) {
return -1;
}
if (kind == USERSTATUS_KIND_RETAIN) {
return 0;
}
self_userstatus_kind = kind;
uint32_t i;
for (i = 0; i < numfriends; ++i)
friendlist[i].userstatus_sent = 0;
return 0;
}
/* return the size of friendnumber's user status
guaranteed to be at most MAX_USERSTATUS_LENGTH */
int m_get_userstatus_size(int friendnumber)
@ -305,11 +325,33 @@ int m_copy_userstatus(int friendnumber, uint8_t * buf, uint32_t maxlen)
return 0;
}
int m_copy_self_userstatus(uint8_t * buf, uint32_t maxlen)
{
memset(buf, 0, maxlen);
memcpy(buf, self_userstatus, MIN(maxlen, MAX_USERSTATUS_LENGTH) - 1);
return 0;
}
USERSTATUS_KIND m_get_userstatus_kind(int friendnumber) {
if (friendnumber >= numfriends || friendnumber < 0)
return USERSTATUS_KIND_INVALID;
USERSTATUS_KIND uk = friendlist[friendnumber].userstatus_kind;
if (uk >= USERSTATUS_KIND_INVALID) {
uk = USERSTATUS_KIND_ONLINE;
}
return uk;
}
USERSTATUS_KIND m_get_self_userstatus_kind(void) {
return self_userstatus_kind;
}
static int send_userstatus(int friendnumber, uint8_t * status, uint16_t length)
{
uint8_t *thepacket = malloc(length + 1);
memcpy(thepacket + 1, status, length);
uint8_t *thepacket = malloc(length + 2);
memcpy(thepacket + 2, status, length);
thepacket[0] = PACKET_ID_USERSTATUS;
thepacket[1] = self_userstatus_kind;
int written = write_cryptpacket(friendlist[friendnumber].crypt_connection_id, thepacket, length + 1);
free(thepacket);
return written;
@ -327,6 +369,11 @@ static int set_friend_userstatus(int friendnumber, uint8_t * status, uint16_t le
return 0;
}
static void set_friend_userstatus_kind(int friendnumber, USERSTATUS_KIND k)
{
friendlist[friendnumber].userstatus_kind = k;
}
/* static void (*friend_request)(uint8_t *, uint8_t *, uint16_t);
static uint8_t friend_request_isset = 0; */
/* set the function that will be executed when a friend request is received. */
@ -353,9 +400,9 @@ void m_callback_namechange(void (*function)(int, uint8_t *, uint16_t))
friend_namechange_isset = 1;
}
static void (*friend_statuschange)(int, uint8_t *, uint16_t);
static void (*friend_statuschange)(int, USERSTATUS_KIND, uint8_t *, uint16_t);
static uint8_t friend_statuschange_isset = 0;
void m_callback_userstatus(void (*function)(int, uint8_t *, uint16_t))
void m_callback_userstatus(void (*function)(int, USERSTATUS_KIND, uint8_t *, uint16_t))
{
friend_statuschange = function;
friend_statuschange_isset = 1;
@ -366,7 +413,7 @@ void m_callback_userstatus(void (*function)(int, uint8_t *, uint16_t))
int initMessenger(void)
{
new_keys();
m_set_userstatus((uint8_t*)"Online", sizeof("Online"));
m_set_userstatus(USERSTATUS_KIND_ONLINE, (uint8_t*)"Online", sizeof("Online"));
initNetCrypto();
IP ip;
ip.i = 0;
@ -438,12 +485,17 @@ static void doFriends(void)
break;
}
case PACKET_ID_USERSTATUS: {
uint8_t *status = calloc(MIN(len - 1, MAX_USERSTATUS_LENGTH), 1);
memcpy(status, temp + 1, MIN(len - 1, MAX_USERSTATUS_LENGTH));
if (len > 2) {
uint8_t *status = calloc(MIN(len - 2, MAX_USERSTATUS_LENGTH), 1);
memcpy(status, temp + 2, MIN(len - 2, MAX_USERSTATUS_LENGTH));
if (friend_statuschange_isset)
friend_statuschange(i, status, MIN(len - 1, MAX_USERSTATUS_LENGTH));
set_friend_userstatus(i, status, MIN(len - 1, MAX_USERSTATUS_LENGTH));
friend_statuschange(i, temp[1], status, MIN(len - 2, MAX_USERSTATUS_LENGTH));
set_friend_userstatus(i, status, MIN(len - 2, MAX_USERSTATUS_LENGTH));
free(status);
} else if (friend_statuschange_isset) {
friend_statuschange(i, temp[1], friendlist[i].userstatus, friendlist[i].userstatus_length);
}
set_friend_userstatus_kind(i, temp[1]);
break;
}
case PACKET_ID_MESSAGE: {

34
core/Messenger.h
View File

@ -60,6 +60,22 @@ extern "C" {
/* don't assume MAX_USERSTATUS_LENGTH will stay at 128, it may be increased
to an absurdly large number later */
/* USERSTATUS_KIND
* Represents the different kinds of userstatus
* someone can have.
* More on this later... */
typedef enum {
USERSTATUS_KIND_RETAIN = (uint8_t)0, /* This is a special value that must not be returned by
* m_get_userstatus_kind. You can pass it into m_set_userstatus
* to keep the current USERSTATUS_KIND. */
USERSTATUS_KIND_ONLINE, /* Recommended representation: Green. */
USERSTATUS_KIND_AWAY, /* Recommended representation: Orange, or yellow. */
USERSTATUS_KIND_BUSY, /* Recommended representation: Red. */
USERSTATUS_KIND_OFFLINE, /* Recommended representation: Grey, semi-transparent. */
USERSTATUS_KIND_INVALID,
} USERSTATUS_KIND;
/*
* add a friend
* set the data that will be sent along with friend request
@ -128,7 +144,8 @@ int getname(int friendnumber, uint8_t *name);
/* set our user status
you are responsible for freeing status after
returns 0 on success, -1 on failure */
int m_set_userstatus(uint8_t *status, uint16_t length);
int m_set_userstatus(USERSTATUS_KIND kind, uint8_t *status, uint16_t length);
int m_set_userstatus_kind(USERSTATUS_KIND kind);
/* return the length of friendnumber's user status,
including null
@ -136,8 +153,17 @@ int m_set_userstatus(uint8_t *status, uint16_t length);
int m_get_userstatus_size(int friendnumber);
/* copy friendnumber's userstatus into buf, truncating if size is over maxlen
get the size you need to allocate from m_get_userstatus_size */
get the size you need to allocate from m_get_userstatus_size
The self variant will copy our own userstatus. */
int m_copy_userstatus(int friendnumber, uint8_t *buf, uint32_t maxlen);
int m_copy_self_userstatus(uint8_t *buf, uint32_t maxlen);
/* Return one of USERSTATUS_KIND values, except USERSTATUS_KIND_RETAIN.
* Values unknown to your application should be represented as USERSTATUS_KIND_ONLINE.
* As above, the self variant will return our own USERSTATUS_KIND.
* If friendnumber is invalid, this shall return USERSTATUS_KIND_INVALID. */
USERSTATUS_KIND m_get_userstatus_kind(int friendnumber);
USERSTATUS_KIND m_get_self_userstatus_kind(void);
/* set the function that will be executed when a friend request is received.
function format is function(uint8_t * public_key, uint8_t * data, uint16_t length) */
@ -153,9 +179,9 @@ void m_callback_friendmessage(void (*function)(int, uint8_t *, uint16_t));
void m_callback_namechange(void (*function)(int, uint8_t *, uint16_t));
/* set the callback for user status changes
function(int friendnumber, uint8_t *newstatus, uint16_t length)
function(int friendnumber, USERSTATUS_KIND kind, uint8_t *newstatus, uint16_t length)
you are not responsible for freeing newstatus */
void m_callback_userstatus(void (*function)(int, uint8_t *, uint16_t));
void m_callback_userstatus(void (*function)(int, USERSTATUS_KIND, uint8_t *, uint16_t));
/* run this at startup
returns 0 if no connection problems

4
testing/nTox.c
View File

@ -228,7 +228,7 @@ void line_eval(char *line)
status[i-3] = line[i];
}
status[i-3] = 0;
m_set_userstatus(status, strlen((char*)status) + 1);
m_set_userstatus(USERSTATUS_KIND_ONLINE, status, strlen((char*)status) + 1);
char numstring[100];
sprintf(numstring, "[i] changed status to %s", (char*)status);
new_lines(numstring);
@ -364,7 +364,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, USERSTATUS_KIND kind, uint8_t *string, uint16_t length)
{
char name[MAX_NAME_LENGTH];
if(getname(friendnumber, (uint8_t*)name) != -1) {

2
testing/nTox_win32.c
View File

@ -86,7 +86,7 @@ void print_nickchange(int friendnumber, uint8_t *string, uint16_t length)
printf(msg);
}
void print_statuschange(int friendnumber, uint8_t *string, uint16_t length)
void print_statuschange(int friendnumber, USERSTATUS_KIND kind, uint8_t *string, uint16_t length)
{
char name[MAX_NAME_LENGTH];
getname(friendnumber, (uint8_t*)name);

2
testing/toxic/chat.c
View File

@ -162,7 +162,7 @@ void execute(ToxWindow* self, ChatContext* ctx, char* cmd)
return;
}
msg++;
m_set_userstatus((uint8_t*) msg, strlen(msg)+1);
m_set_userstatus(USERSTATUS_KIND_RETAIN, (uint8_t*) msg, strlen(msg)+1);
wprintw(ctx->history, "Status set to: %s\n", msg);
}
else if (!strncmp(cmd, "/nick ", strlen("/nick "))) {

2
testing/toxic/main.c
View File

@ -69,7 +69,7 @@ void on_nickchange(int friendnumber, uint8_t* string, uint16_t length) {
}
}
void on_statuschange(int friendnumber, uint8_t* string, uint16_t length) {
void on_statuschange(int friendnumber, USERSTATUS_KIND kind, uint8_t* string, uint16_t length) {
size_t i;
wprintw(prompt->window, "\n(statuschange) %d: %s!\n", friendnumber, string);

2
testing/toxic/prompt.c
View File

@ -174,7 +174,7 @@ static void execute(ToxWindow* self, char* cmd) {
}
msg++;
m_set_userstatus((uint8_t*) msg, strlen(msg)+1);
m_set_userstatus(USERSTATUS_KIND_RETAIN, (uint8_t*) msg, strlen(msg)+1);
wprintw(self->window, "Status set to: %s\n", msg);
}
else if(!strncmp(cmd, "nick ", strlen("nick "))) {