ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-02-11 13:16:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up compiler warning in monitor.c

Browse Source
This commit is contained in:
Andrew Bettison 2012-06-25 15:00:07 +09:30
parent 208b9c15fd
commit a960ed4e8a
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
monitor.c
View File

@ -660,9 +660,9 @@ int monitor_call_status(vomp_call_state *call)
int monitor_announce_peer(unsigned char *sid) int monitor_announce_peer(unsigned char *sid)
{ {
unsigned char msg[1024]; char msg[1024];
snprintf((char *)msg,1024,"\nNEWPEER:%s\n",overlay_render_sid(sid)); int n = snprintf(msg, sizeof msg, "\nNEWPEER:%s\n",overlay_render_sid(sid));
monitor_tell_clients(msg,strlen((char *)msg),MONITOR_PEERS); monitor_tell_clients(msg, n, MONITOR_PEERS);
return 0; return 0;
} }
@ -670,14 +670,13 @@ int monitor_send_audio(vomp_call_state *call,overlay_mdp_frame *audio)
{ {
if (0) WHYF("Tell call monitor about audio for call %06x:%06x", if (0) WHYF("Tell call monitor about audio for call %06x:%06x",
call->local.session,call->remote.session); call->local.session,call->remote.session);
int sample_bytes=vomp_sample_size(audio->vompevent.audio_sample_codec); int sample_bytes=vomp_sample_size(audio->vompevent.audio_sample_codec);
unsigned char msg[1024+MAX_AUDIO_BYTES]; char msg[1024 + MAX_AUDIO_BYTES];
/* All commands followed by binary data start with *len:, so that /* All commands followed by binary data start with *len:, so that
they can be easily parsed at the far end, even if not supported. they can be easily parsed at the far end, even if not supported.
Put newline at start of these so that receiving data in command Put newline at start of these so that receiving data in command
mode doesn't confuse the parser. */ mode doesn't confuse the parser. */
snprintf((char *)msg,1024, int msglen = snprintf(msg, 1024,
"\n*%d:AUDIOPACKET:%06x:%06x:%d:%d:%d:%lld:%lld\n", "\n*%d:AUDIOPACKET:%06x:%06x:%d:%d:%d:%lld:%lld\n",
sample_bytes, sample_bytes,
call->local.session,call->remote.session, call->local.session,call->remote.session,
@ -685,17 +684,13 @@ int monitor_send_audio(vomp_call_state *call,overlay_mdp_frame *audio)
audio->vompevent.audio_sample_codec, audio->vompevent.audio_sample_codec,
audio->vompevent.audio_sample_starttime, audio->vompevent.audio_sample_starttime,
audio->vompevent.audio_sample_endtime); audio->vompevent.audio_sample_endtime);
int msglen=strlen((char *)msg); bcopy(&audio->vompevent.audio_bytes[0], &msg[msglen], sample_bytes);
bcopy(&audio->vompevent.audio_bytes[0],
&msg[msglen],sample_bytes);
msglen+=sample_bytes; msglen+=sample_bytes;
monitor_tell_clients(msg, msglen, MONITOR_VOMP); monitor_tell_clients(msg, msglen, MONITOR_VOMP);
return 0; return 0;
} }
int monitor_tell_clients(unsigned char *msg,int msglen,int mask) int monitor_tell_clients(char *msg, int msglen, int mask)
{ {
int i; int i;
for(i=0;i<monitor_socket_count;i++) for(i=0;i<monitor_socket_count;i++)

2
serval.h
View File

@ -1490,7 +1490,7 @@ int monitor_get_fds(struct pollfd *fds,int *fdcount,int fdmax);
int monitor_call_status(vomp_call_state *call); int monitor_call_status(vomp_call_state *call);
int monitor_send_audio(vomp_call_state *call,overlay_mdp_frame *audio); int monitor_send_audio(vomp_call_state *call,overlay_mdp_frame *audio);
int monitor_announce_peer(unsigned char *sid); int monitor_announce_peer(unsigned char *sid);
int monitor_tell_clients(unsigned char *msg,int msglen,int mask); int monitor_tell_clients(char *msg, int msglen, int mask);
extern int monitor_socket_count; extern int monitor_socket_count;