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 branch 'master' of https://github.com/mannol1/toxcore

Browse Source 
Conflicts:
	toxav/toxav.c
This commit is contained in:
irungentoo 2014-08-04 13:49:53 -04:00
commit aaaeac8f3d
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
6 changed files with 54 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toxav/codec.c
View File

@ -83,7 +83,7 @@ void queue(JitterBuffer *q, RTPMessage *pk)
unsigned int num = sequnum % q->size;
if (sequnum - q->bottom > q->size) {
if ((uint32_t)(sequnum - q->bottom) > q->size) {
clear_queue(q);
q->bottom = sequnum;
q->queue[num] = pk;
@ -118,7 +118,7 @@ RTPMessage *dequeue(JitterBuffer *q, int *success)
return ret;
}
if (q->top - q->bottom > q->capacity) {
if ((uint32_t)(q->top - q->bottom) > q->capacity) {
++q->bottom;
*success = 2;
return NULL;

4
toxav/codec.h
View File

@ -80,8 +80,8 @@ typedef struct _CodecState {
typedef struct _JitterBuffer {
RTPMessage **queue;
unsigned int size;
unsigned int capacity;
uint32_t size;
uint32_t capacity;
uint16_t bottom;
uint16_t top;
} JitterBuffer;

66
toxav/msi.c
View File

@ -139,7 +139,7 @@ static int parse_raw_data ( MSIMessage *msg, const uint8_t *data, uint16_t lengt
#define FAIL_CONSTRAINT(constraint, wanted) if ((constraint -= wanted) < 1) { LOGGER_ERROR("Read over length!"); return -1; }
#define FAIL_SIZE(byte, valid) if ( byte != valid ) { LOGGER_ERROR("Invalid data size!"); return -1; }
#define FAIL_LIMITS(byte, low, high) if ( byte < low || byte > high ) { LOGGER_ERROR("Invalid data!"); return -1; }
#define FAIL_LIMITS(byte, high) if ( byte > high ) { LOGGER_ERROR("Failed limit!"); return -1; }
if ( msg == NULL ) {
LOGGER_ERROR("Could not parse message: no storage!");
@ -159,7 +159,8 @@ static int parse_raw_data ( MSIMessage *msg, const uint8_t *data, uint16_t lengt
case IDRequest:
FAIL_CONSTRAINT(size_constraint, 3);
FAIL_SIZE(it[1], 1);
FAIL_LIMITS(it[2], invite, end);
// FAIL_LIMITS(it[2], invite, end);
FAIL_LIMITS(it[2], end);
msg->request.value = it[2];
it += 3;
msg->request.exists = 1;
@ -168,7 +169,8 @@ static int parse_raw_data ( MSIMessage *msg, const uint8_t *data, uint16_t lengt
case IDResponse:
FAIL_CONSTRAINT(size_constraint, 3);
FAIL_SIZE(it[1], 1);
FAIL_LIMITS(it[2], ringing, error);
// FAIL_LIMITS(it[2], ringing, error);
FAIL_LIMITS(it[2], error);
msg->response.value = it[2];
it += 3;
msg->response.exists = 1;
@ -454,7 +456,7 @@ typedef struct _Timer {
void *func_arg1;
int func_arg2;
uint64_t timeout;
size_t idx;
int idx;
} Timer;
@ -462,8 +464,8 @@ typedef struct _TimerHandler {
Timer **timers;
pthread_mutex_t mutex;
size_t max_capacity;
size_t size;
uint32_t max_capacity;
uint32_t size;
uint64_t resolution;
_Bool running;
@ -484,12 +486,12 @@ struct timer_function_args {
* @param timeout Timeout in ms
* @return int
*/
static int timer_alloc ( TimerHandler *timers_container, void *(func)(void *), void *arg1, int arg2, unsigned timeout)
static int timer_alloc ( TimerHandler *timers_container, void *(func)(void *), void *arg1, int arg2, uint32_t timeout)
{
static int timer_id;
pthread_mutex_lock(&timers_container->mutex);
int i = 0;
uint32_t i = 0;
for (; i < timers_container->max_capacity && timers_container->timers[i]; i ++);
@ -518,7 +520,7 @@ static int timer_alloc ( TimerHandler *timers_container, void *(func)(void *), v
/* reorder */
if (i) {
int j = i - 1;
int64_t j = i - 1;
for (; j >= 0 && timeout < timers_container->timers[j]->timeout; j--) {
Timer *tmp = timers_container->timers[j];
@ -529,7 +531,7 @@ static int timer_alloc ( TimerHandler *timers_container, void *(func)(void *), v
pthread_mutex_unlock(&timers_container->mutex);
LOGGER_DEBUG("Allocated timer index: %d timeout: %d, current size: %d", i, timeout, timers_container->size);
LOGGER_DEBUG("Allocated timer index: %ull timeout: %ull, current size: %ull", i, timeout, timers_container->size);
return timer->idx;
}
@ -548,16 +550,17 @@ static int timer_release ( TimerHandler *timers_container, int idx , int lock_mu
Timer **timed_events = timers_container->timers;
int i, res = -1;
size_t i;
int rc = -1;
for (i = 0; i < timers_container->max_capacity; ++i) {
if (timed_events[i] && timed_events[i]->idx == idx) {
res = i;
rc = i;
break;
}
}
if (res == -1) {
if (rc == -1) {
LOGGER_WARNING("No event with id: %d", idx);
if (lock_mutex) pthread_mutex_unlock(&timers_container->mutex);
@ -565,11 +568,11 @@ static int timer_release ( TimerHandler *timers_container, int idx , int lock_mu
return -1;
}
free(timed_events[res]);
free(timed_events[rc]);
timed_events[res] = NULL;
timed_events[rc] = NULL;
i = res + 1;
i = rc + 1;
for (; i < timers_container->max_capacity && timed_events[i]; i ++) {
timed_events[i - 1] = timed_events[i];
@ -578,7 +581,7 @@ static int timer_release ( TimerHandler *timers_container, int idx , int lock_mu
timers_container->size--;
LOGGER_DEBUG("Popped id: %d, current size: %d ", idx, timers_container->size);
LOGGER_DEBUG("Popped id: %d, current size: %ull ", idx, timers_container->size);
if (lock_mutex) pthread_mutex_unlock(&timers_container->mutex);
@ -688,7 +691,7 @@ static void timer_terminate_session(TimerHandler *handler)
pthread_mutex_unlock(&handler->mutex);
int i = 0;
size_t i = 0;
for (; i < handler->max_capacity; i ++)
free(handler->timers[i]);
@ -855,20 +858,21 @@ static int terminate_call ( MSISession *session, MSICall *call );
static void handle_remote_connection_change(Messenger *messenger, int friend_num, uint8_t status, void *session_p)
{
(void)messenger;
MSISession *session = session_p;
switch ( status ) {
case 0: { /* Went offline */
uint32_t j = 0;
int32_t j = 0;
for ( ; j < session->max_calls; j ++ ) {
if ( !session->calls[j] ) continue;
int i = 0;
uint16_t i = 0;
for ( ; i < session->calls[j]->peer_count; i ++ )
if ( session->calls[j]->peers[i] == friend_num ) {
if ( session->calls[j]->peers[i] == (uint32_t)friend_num ) {
invoke_callback(session, j, MSI_OnPeerTimeout);
terminate_call(session, session->calls[j]);
LOGGER_DEBUG("Remote: %d timed out!", friend_num);
@ -887,7 +891,7 @@ static MSICall *find_call ( MSISession *session, uint8_t *call_id )
{
if ( call_id == NULL ) return NULL;
uint32_t i = 0;
int32_t i = 0;
for (; i < session->max_calls; i ++ )
if ( session->calls[i] && memcmp(session->calls[i]->id, call_id, sizeof(session->calls[i]->id)) == 0 ) {
@ -1105,7 +1109,7 @@ static int handle_recv_invite ( MSISession *session, MSICall *call, MSIMessage *
}
if ( call ) {
if ( call->peers[0] == msg->friend_id ) {
if ( call->peers[0] == (uint32_t)msg->friend_id ) {
if (call->state == call_inviting) {
/* The glare case. A calls B when at the same time
* B calls A. Who has advantage is set bey calculating
@ -1193,6 +1197,8 @@ static int handle_recv_start ( MSISession *session, MSICall *call, MSIMessage *m
return 0;
}
(void)msg;
LOGGER_DEBUG("Session: %p Handling 'start' on call: %d, friend id: %d", session, call->call_idx, msg->friend_id );
pthread_mutex_lock(&session->mutex);
@ -1233,6 +1239,8 @@ static int handle_recv_cancel ( MSISession *session, MSICall *call, MSIMessage *
return 0;
}
(void)msg;
LOGGER_DEBUG("Session: %p Handling 'cancel' on call: %u", session, call->call_idx);
invoke_callback(session, call->call_idx, MSI_OnCancel);
@ -1275,6 +1283,8 @@ static int handle_recv_ringing ( MSISession *session, MSICall *call, MSIMessage
return 0;
}
(void)msg;
pthread_mutex_lock(&session->mutex);
if ( call->ringing_timer_id ) {
@ -1343,6 +1353,8 @@ static int handle_recv_ending ( MSISession *session, MSICall *call, MSIMessage *
return 0;
}
(void)msg;
LOGGER_DEBUG("Session: %p Handling 'ending' on call: %d", session, call->call_idx );
invoke_callback(session, call->call_idx, MSI_OnEnding);
@ -1591,7 +1603,7 @@ int msi_terminate_session ( MSISession *session )
int _status = 0;
/* If have calls, cancel them */
uint32_t idx = 0;
int32_t idx = 0;
for (; idx < session->max_calls; idx ++) if ( session->calls[idx] ) {
/* Cancel all? */
@ -1784,6 +1796,9 @@ int msi_cancel ( MSISession *session, int32_t call_index, uint32_t peer, const c
msi_msg_set_reason(msg_cancel, reason_cast);
}
#else
(void)reason;
#endif
send_message ( session, session->calls[call_index], msg_cancel, peer );
@ -1826,6 +1841,9 @@ int msi_reject ( MSISession *session, int32_t call_index, const char *reason )
msi_msg_set_reason(msg_reject, reason_cast);
}
#else
(void)reason;
#endif
send_message ( session, session->calls[call_index], msg_reject,

2
toxav/rtp.c
View File

@ -112,7 +112,7 @@ RTPHeader *extract_header ( const uint8_t *payload, int length )
* I don't need to parse the other stuff if it's bad
*/
uint8_t _cc = GET_FLAG_CSRCC ( _retu );
uint32_t _length = 12 /* Minimum header len */ + ( _cc * 4 );
int _length = 12 /* Minimum header len */ + ( _cc * 4 );
if ( length < _length ) {
/* Deallocate */

2
toxav/toxav.c
View File

@ -193,7 +193,7 @@ ToxAv *toxav_new( Tox *messenger, int32_t max_calls)
*/
void toxav_kill ( ToxAv *av )
{
int i;
uint32_t i;
for (i = 0; i < av->max_calls; i ++) {
if ( av->calls[i].crtps[audio_index] )

12
toxcore/logger.h
View File

@ -68,13 +68,13 @@ char *logger_timestr (char *dest, size_t max_size);
#else
#define LOGGER_INIT(name, level)
#define LOGGER_INFO(format, ...)
#define LOGGER_DEBUG(format, ...)
#define LOGGER_WARNING(format, ...)
#define LOGGER_ERROR(format, ...)
#define LOGGER_INIT(name, level) do {} while(0)
#define LOGGER_INFO(format, ...) do {} while(0)
#define LOGGER_DEBUG(format, ...) do {} while(0)
#define LOGGER_WARNING(format, ...) do {} while(0)
#define LOGGER_ERROR(format, ...) do {} while(0)
#define LOGGER_SCOPE(__SCOPE_DO__)
#define LOGGER_SCOPE(__SCOPE_DO__) do {} while(0)
#endif /* LOGGING */