Commit 009290df authored by Guillaume Beraudo's avatar Guillaume Beraudo

Remove zid

parent 16ce6750
...@@ -102,7 +102,6 @@ typedef struct _MediastreamDatas { ...@@ -102,7 +102,6 @@ typedef struct _MediastreamDatas {
int el_sustain; int el_sustain;
float el_transmit_thres; float el_transmit_thres;
float ng_floorgain; float ng_floorgain;
char * zrtp_id;
char * zrtp_secrets; char * zrtp_secrets;
PayloadType *custom_pt; PayloadType *custom_pt;
int video_window_id; int video_window_id;
...@@ -170,7 +169,7 @@ const char *usage="mediastream --local <port> --remote <ip:port> \n" ...@@ -170,7 +169,7 @@ const char *usage="mediastream --local <port> --remote <ip:port> \n"
"[ --el-sustain <(int)> (Time in milliseconds for which the attenuation is kept unchanged after) ]\n" "[ --el-sustain <(int)> (Time in milliseconds for which the attenuation is kept unchanged after) ]\n"
"[ --el-transmit-thres <(float) [0-1]> (TO BE DOCUMENTED) ]\n" "[ --el-transmit-thres <(float) [0-1]> (TO BE DOCUMENTED) ]\n"
"[ --rc (enable adaptive rate control) ]\n" "[ --rc (enable adaptive rate control) ]\n"
"[ --zrtp <zid> <secrets file> (enable zrtp) ]\n" "[ --zrtp <secrets file> (enable zrtp) ]\n"
"[ --verbose (most verbose messages) ]\n" "[ --verbose (most verbose messages) ]\n"
"[ --video-windows-id <video surface:preview surface>]\n" "[ --video-windows-id <video surface:preview surface>]\n"
"[ --srtp <local master_key> <remote master_key> (enable srtp, master key is generated if absent from comand line)\n" "[ --srtp <local master_key> <remote master_key> (enable srtp, master key is generated if absent from comand line)\n"
...@@ -270,7 +269,6 @@ MediastreamDatas* init_default_args() { ...@@ -270,7 +269,6 @@ MediastreamDatas* init_default_args() {
args->el_transmit_thres=-1; args->el_transmit_thres=-1;
args->ng_floorgain=-1; args->ng_floorgain=-1;
args->use_rc=FALSE; args->use_rc=FALSE;
args->zrtp_id=NULL;
args->zrtp_secrets=NULL; args->zrtp_secrets=NULL;
args->custom_pt=NULL; args->custom_pt=NULL;
args->video_window_id = -1; args->video_window_id = -1;
...@@ -395,7 +393,6 @@ bool_t parse_args(int argc, char** argv, MediastreamDatas* out) { ...@@ -395,7 +393,6 @@ bool_t parse_args(int argc, char** argv, MediastreamDatas* out) {
i++; i++;
out->el_transmit_thres=atof(argv[i]); out->el_transmit_thres=atof(argv[i]);
} else if (strcmp(argv[i],"--zrtp")==0){ } else if (strcmp(argv[i],"--zrtp")==0){
out->zrtp_id=argv[++i];
out->zrtp_secrets=argv[++i]; out->zrtp_secrets=argv[++i];
} else if (strcmp(argv[i],"--verbose")==0){ } else if (strcmp(argv[i],"--verbose")==0){
out->is_verbose=TRUE; out->is_verbose=TRUE;
...@@ -554,9 +551,8 @@ void setup_media_streams(MediastreamDatas* args) { ...@@ -554,9 +551,8 @@ void setup_media_streams(MediastreamDatas* args) {
} }
#ifndef TARGET_OS_IPHONE #ifndef TARGET_OS_IPHONE
if (args->zrtp_id != NULL) { if (args->zrtp_secrets != NULL) {
OrtpZrtpParams params; OrtpZrtpParams params;
params.zid=args->zrtp_id;
params.zid_file=args->zrtp_secrets; params.zid_file=args->zrtp_secrets;
audio_stream_enable_zrtp(args->audio,&params); audio_stream_enable_zrtp(args->audio,&params);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment