diff options
-rw-r--r-- | pjlib-util/include/pjlib-util.h | 1 | ||||
-rw-r--r-- | pjlib-util/include/pjlib-util/base64.h | 2 | ||||
-rw-r--r-- | pjlib-util/src/pjlib-util-test/encryption.c | 4 | ||||
-rw-r--r-- | pjlib-util/src/pjlib-util/base64.c | 2 | ||||
-rw-r--r-- | pjsip-apps/src/pjsua/pjsua_app.c | 4 | ||||
-rw-r--r-- | pjsip/build/Makefile | 5 |
6 files changed, 10 insertions, 8 deletions
diff --git a/pjlib-util/include/pjlib-util.h b/pjlib-util/include/pjlib-util.h index c12e0b28..fcafcf1e 100644 --- a/pjlib-util/include/pjlib-util.h +++ b/pjlib-util/include/pjlib-util.h @@ -32,6 +32,7 @@ #include <pjlib-util/getopt.h> /* Crypto */ +#include <pjlib-util/base64.h> #include <pjlib-util/crc32.h> #include <pjlib-util/hmac_md5.h> #include <pjlib-util/hmac_sha1.h> diff --git a/pjlib-util/include/pjlib-util/base64.h b/pjlib-util/include/pjlib-util/base64.h index b01f918b..f7a20a6c 100644 --- a/pjlib-util/include/pjlib-util/base64.h +++ b/pjlib-util/include/pjlib-util/base64.h @@ -76,7 +76,7 @@ PJ_DECL(pj_status_t) pj_base64_encode(const pj_uint8_t *input, int in_len, * length of the output. */ PJ_DECL(pj_status_t) pj_base64_decode(const pj_str_t *input, - pj_uint8_t *out, long *out_len); + pj_uint8_t *out, int *out_len); diff --git a/pjlib-util/src/pjlib-util-test/encryption.c b/pjlib-util/src/pjlib-util-test/encryption.c index 8fc2f828..62d03315 100644 --- a/pjlib-util/src/pjlib-util-test/encryption.c +++ b/pjlib-util/src/pjlib-util-test/encryption.c @@ -530,7 +530,7 @@ static int base64_test(void) pj_str_t input; int out_len = sizeof(output); - rc = pj_base64_encode(base64_test_vec[i].base256, + rc = pj_base64_encode((pj_uint8_t*)base64_test_vec[i].base256, strlen(base64_test_vec[i].base256), output, &out_len); if (rc != PJ_SUCCESS) @@ -545,7 +545,7 @@ static int base64_test(void) /* Decode test */ out_len = sizeof(output); - input.ptr = base64_test_vec[i].base64; + input.ptr = (char*)base64_test_vec[i].base64; input.slen = strlen(base64_test_vec[i].base64); rc = pj_base64_decode(&input, (pj_uint8_t*)output, &out_len); if (rc != PJ_SUCCESS) diff --git a/pjlib-util/src/pjlib-util/base64.c b/pjlib-util/src/pjlib-util/base64.c index 7bad4b4a..970de19c 100644 --- a/pjlib-util/src/pjlib-util/base64.c +++ b/pjlib-util/src/pjlib-util/base64.c @@ -119,7 +119,7 @@ PJ_DEF(pj_status_t) pj_base64_encode(const pj_uint8_t *input, int in_len, PJ_DEF(pj_status_t) pj_base64_decode(const pj_str_t *input, - pj_uint8_t *out, long *out_len) + pj_uint8_t *out, int *out_len) { const char *buf = input->ptr; int len = input->slen; diff --git a/pjsip-apps/src/pjsua/pjsua_app.c b/pjsip-apps/src/pjsua/pjsua_app.c index 4b2b001b..919a1907 100644 --- a/pjsip-apps/src/pjsua/pjsua_app.c +++ b/pjsip-apps/src/pjsua/pjsua_app.c @@ -1614,8 +1614,8 @@ static void on_call_tsx_state(pjsua_call_id call_id, */ if (tsx->role == PJSIP_ROLE_UAC && (tsx->state == PJSIP_TSX_STATE_COMPLETED || - tsx->state == PJSIP_TSX_STATE_TERMINATED && - e->body.tsx_state.prev_state != PJSIP_TSX_STATE_COMPLETED)) + (tsx->state == PJSIP_TSX_STATE_TERMINATED && + e->body.tsx_state.prev_state != PJSIP_TSX_STATE_COMPLETED))) { /* Status of outgoing INFO request */ if (tsx->status_code >= 200 && tsx->status_code < 300) { diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile index 6ddb0146..dd331a1a 100644 --- a/pjsip/build/Makefile +++ b/pjsip/build/Makefile @@ -39,8 +39,9 @@ export PJSIP_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ sip_errno.o sip_msg.o sip_parser.o sip_tel_uri.o sip_uri.o \ sip_endpoint.o sip_util.o sip_util_proxy.o \ sip_resolve.o sip_transport.o sip_transport_loop.o \ - sip_transport_udp.o sip_transport_tcp.o sip_transport_tls_ossl.o \ - sip_auth_client.o sip_auth_msg.o sip_auth_parser.o \ + sip_transport_udp.o sip_transport_tcp.o \ + sip_transport_tls_ossl.o sip_auth_aka.o sip_auth_client.o \ + sip_auth_msg.o sip_auth_parser.o \ sip_auth_server.o \ sip_transaction.o sip_util_statefull.o \ sip_dialog.o sip_ua_layer.o |