MT#55283 further defuse error log

If SRTP/DTLS isn't yet established, do fully bail out of the kernelize
function, instead of just logging a message and blindly continuing, as
it would eventually fail due to missing or invalid SRTP parameters.

Fix-up for f2d57de078

Change-Id: I3521f54fe2001d3c67118a3502807d8cb6ada7ee
(cherry picked from commit 7ab5cf3ebf)
mr26.1
Richard Fuchs 3 weeks ago
parent 250cc1276f
commit c3b8da318f

@ -1649,7 +1649,7 @@ static const char *kernelize_target(kernelize_state *s, struct packet_stream *st
int ret = handler->in->kernel(&reti->decrypt, stream);
if (ret) {
ilog(LOG_NOTICE, "Decryption SRTP not yet negotiated");
return NULL;
return "";
}
if (!reti->decrypt.cipher || !reti->decrypt.hmac)
return "decryption cipher or HMAC not supported by kernel module";
@ -1971,7 +1971,8 @@ static void kernelize(struct packet_stream *stream) {
const char *err = kernelize_target(&s, stream);
if (err) {
ilog(LOG_WARNING, "No support for kernel packet forwarding available (%s)", err);
if (*err)
ilog(LOG_WARNING, "No support for kernel packet forwarding available (%s)", err);
goto no_kernel;
}

Loading…
Cancel
Save