diff options
Diffstat (limited to 'pjsip-apps/src/samples/icedemo.c')
| -rw-r--r-- | pjsip-apps/src/samples/icedemo.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/pjsip-apps/src/samples/icedemo.c b/pjsip-apps/src/samples/icedemo.c index 598ab1b..10c2b1a 100644 --- a/pjsip-apps/src/samples/icedemo.c +++ b/pjsip-apps/src/samples/icedemo.c @@ -514,9 +514,9 @@ static void icedemo_stop_session(void) reset_rem_info(); } -#define PRINT(fmt, arg0, arg1, arg2, arg3, arg4, arg5) \ +#define PRINT(...) \ printed = pj_ansi_snprintf(p, maxlen - (p-buffer), \ - fmt, arg0, arg1, arg2, arg3, arg4, arg5); \ + __VA_ARGS__); \ if (printed <= 0) return -PJ_ETOOSMALL; \ p += printed @@ -539,8 +539,7 @@ static int print_cand(char buffer[], unsigned maxlen, (unsigned)pj_sockaddr_get_port(&cand->addr)); PRINT("%s\n", - pj_ice_get_cand_type_name(cand->type), - 0, 0, 0, 0, 0); + pj_ice_get_cand_type_name(cand->type)); if (p == buffer+maxlen) return -PJ_ETOOSMALL; @@ -562,8 +561,7 @@ static int encode_session(char buffer[], unsigned maxlen) pj_status_t status; /* Write "dummy" SDP v=, o=, s=, and t= lines */ - PRINT("v=0\no=- 3414953978 3414953978 IN IP4 localhost\ns=ice\nt=0 0\n", - 0, 0, 0, 0, 0, 0); + PRINT("v=0\no=- 3414953978 3414953978 IN IP4 localhost\ns=ice\nt=0 0\n"); /* Get ufrag and pwd from current session */ pj_ice_strans_get_ufrag_pwd(icedemo.icest, &local_ufrag, &local_pwd, @@ -574,8 +572,7 @@ static int encode_session(char buffer[], unsigned maxlen) (int)local_ufrag.slen, local_ufrag.ptr, (int)local_pwd.slen, - local_pwd.ptr, - 0, 0); + local_pwd.ptr); /* Write each component */ for (comp=0; comp<icedemo.opt.comp_cnt; ++comp) { @@ -595,22 +592,19 @@ static int encode_session(char buffer[], unsigned maxlen) "c=IN IP4 %s\n", (int)pj_sockaddr_get_port(&cand[0].addr), pj_sockaddr_print(&cand[0].addr, ipaddr, - sizeof(ipaddr), 0), - 0, 0, 0, 0); + sizeof(ipaddr), 0)); } else if (comp==1) { /* For component 2, default address is in a=rtcp line */ PRINT("a=rtcp:%d IN IP4 %s\n", (int)pj_sockaddr_get_port(&cand[0].addr), pj_sockaddr_print(&cand[0].addr, ipaddr, - sizeof(ipaddr), 0), - 0, 0, 0, 0); + sizeof(ipaddr), 0)); } else { /* For other components, we'll just invent this.. */ PRINT("a=Xice-defcand:%d IN IP4 %s\n", (int)pj_sockaddr_get_port(&cand[0].addr), pj_sockaddr_print(&cand[0].addr, ipaddr, - sizeof(ipaddr), 0), - 0, 0, 0, 0); + sizeof(ipaddr), 0)); } /* Enumerate all candidates for this component */ |