kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-6884 #comment these were mostly simple warnings

This commit is contained in:
Jeff Lenk 2014-10-02 19:20:09 -05:00
parent 8db31f976f
commit ae5d86515a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mod/applications/mod_conference/mod_conference.c
View File

@ -413,7 +413,7 @@ typedef struct conference_obj {
int comfort_noise_level; int comfort_noise_level;
int auto_recording; int auto_recording;
int record_count; int record_count;
int min_recording_participants; uint32_t min_recording_participants;
int video_running; int video_running;
int ivr_dtmf_timeout; int ivr_dtmf_timeout;
int ivr_input_timeout; int ivr_input_timeout;
@ -4659,7 +4659,8 @@ static void member_add_file_data(conference_member_t *member, int16_t *data, swi
if (file_sample_len <= 0) { if (file_sample_len <= 0) {
member->fnode->done++; member->fnode->done++;
} else { /* there is file node data to mix into the frame */ } else { /* there is file node data to mix into the frame */
int32_t i, sample; uint32_t i;
int32_t sample;
/* Check for output volume adjustments */ /* Check for output volume adjustments */
if (member->volume_out_level) { if (member->volume_out_level) {
@ -5518,7 +5519,7 @@ static switch_status_t conference_play_file(conference_obj_t *conference, char *
switch_core_file_close(&fnode->fh); switch_core_file_close(&fnode->fh);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Position Data.\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Position Data.\n");
fnode->al = NULL; fnode->al = NULL;
channels = conference->channels; channels = (uint8_t)conference->channels;
bad_params = 1; bad_params = 1;
goto retry; goto retry;
} }

7
src/mod/endpoints/mod_sofia/sofia.c
View File

@ -5178,13 +5178,13 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name)
} else if (!strcasecmp(var, "tls-ciphers") && !zstr(val)) { } else if (!strcasecmp(var, "tls-ciphers") && !zstr(val)) {
profile->tls_ciphers = switch_core_strdup(profile->pool, val); profile->tls_ciphers = switch_core_strdup(profile->pool, val);
} else if (!strcasecmp(var, "tls-version") && !zstr(val)) { } else if (!strcasecmp(var, "tls-version") && !zstr(val)) {
char *ps = val, *pe; char *ps = val, *pe = val;
profile->tls_version = 0; profile->tls_version = 0;
while (1) { while (ps && *pe) {
int n; int n;
pe = strchr(ps,','); pe = strchr(ps,',');
if (!pe && !(pe = memchr(ps,0,1024))) break; if (!pe && !(pe = memchr(ps,0,1024))) break;
n = pe-ps; n = (int)(pe-ps);
if (n==5 && !strncasecmp(ps, "sslv2", n)) if (n==5 && !strncasecmp(ps, "sslv2", n))
profile->tls_version |= SOFIA_TLS_VERSION_SSLv2; profile->tls_version |= SOFIA_TLS_VERSION_SSLv2;
if (n==5 && !strncasecmp(ps, "sslv3", n)) if (n==5 && !strncasecmp(ps, "sslv3", n))
@ -5198,7 +5198,6 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name)
if (n==7 && !strncasecmp(ps, "tlsv1.2", n)) if (n==7 && !strncasecmp(ps, "tlsv1.2", n))
profile->tls_version |= SOFIA_TLS_VERSION_TLSv1_2; profile->tls_version |= SOFIA_TLS_VERSION_TLSv1_2;
ps=pe+1; ps=pe+1;
if (!*pe) break;
} }
} else if (!strcasecmp(var, "tls-timeout")) { } else if (!strcasecmp(var, "tls-timeout")) {
int v = atoi(val); int v = atoi(val);