From aed9711f1c29b7d5832c2a9297231a5a0c4d1be1 Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandresavard@msavard.(none)>
Date: Wed, 8 Jun 2011 16:07:17 -0400
Subject: [PATCH] #6058: Fix base64 encoding related warnings
---
sflphone-common/libs/iax2/iax.c | 3 ++-
sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/sflphone-common/libs/iax2/iax.c b/sflphone-common/libs/iax2/iax.c
index 3ae3c25b82..00d06e7e51 100644
--- a/sflphone-common/libs/iax2/iax.c
+++ b/sflphone-common/libs/iax2/iax.c
@@ -878,6 +878,7 @@ int iax_init(int preferredportno)
{
struct sockaddr_in sin;
socklen_t sinlen;
+ socklen_t *slen = &sinlen;
int flags;
int bufsize = 256 * 1024;
@@ -928,7 +929,7 @@ int iax_init(int preferredportno)
}
sinlen = sizeof(sin);
- if (getsockname(netfd, (struct sockaddr *) &sin, &sinlen) < 0)
+ if (getsockname(netfd, (struct sockaddr *) &sin, slen) < 0)
{
close(netfd);
netfd = -1;
diff --git a/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp b/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
index 6aad8263d6..d14f0efdfa 100644
--- a/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
+++ b/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
@@ -319,7 +319,7 @@ char* AudioSrtpSession::encodeBase64 (unsigned char *input, int length)
b64 = BIO_push (b64, bmem);
BIO_write (b64, input, length);
- BIO_flush (b64);
+ // BIO_flush (b64);
// get pointer to data
BIO_get_mem_ptr (b64, &bptr);
--
GitLab