forked from pool/libzrtpcpp
61 lines
1.6 KiB
Diff
61 lines
1.6 KiB
Diff
--- src/ZrtpQueue.cpp
|
|
+++ src/ZrtpQueue.cpp
|
|
@@ -585,6 +585,7 @@
|
|
if (zrtpUserCallback != NULL) {
|
|
return zrtpUserCallback->checkSASSignature(sas);
|
|
}
|
|
+ return false;
|
|
}
|
|
|
|
void ZrtpQueue::setEnableZrtp(bool onOff) {
|
|
@@ -649,6 +650,7 @@
|
|
bool ZrtpQueue::isMultiStream() {
|
|
if (zrtpEngine != NULL)
|
|
return zrtpEngine->isMultiStream();
|
|
+ return false;
|
|
}
|
|
|
|
void ZrtpQueue::acceptEnrollment(bool accepted) {
|
|
@@ -659,16 +661,19 @@
|
|
bool ZrtpQueue::setSignatureData(uint8* data, int32 length) {
|
|
if (zrtpEngine != NULL)
|
|
return zrtpEngine->setSignatureData(data, length);
|
|
+ return false;
|
|
}
|
|
|
|
int32 ZrtpQueue::getSignatureData(uint8* data) {
|
|
if (zrtpEngine != NULL)
|
|
return zrtpEngine->getSignatureData(data);
|
|
+ return 0;
|
|
}
|
|
|
|
int32 ZrtpQueue::getSignatureLength() {
|
|
if (zrtpEngine != NULL)
|
|
return zrtpEngine->getSignatureLength();
|
|
+ return 0;
|
|
}
|
|
|
|
void ZrtpQueue::setPBXEnrollment(bool yesNo) {
|
|
--- src/ZrtpStateClass.cxx
|
|
+++ src/ZrtpStateClass.cxx
|
|
@@ -421,7 +421,8 @@
|
|
*/
|
|
else if (event->type == Timer) {
|
|
if (!parent->sendPacketZRTP(sentPacket)) {
|
|
- return sendFailed(); // returns to state Initial
|
|
+ sendFailed(); // returns to state Initial
|
|
+ return;
|
|
}
|
|
if (nextTimer(&T1) <= 0) {
|
|
parent->zrtpNotSuppOther();
|
|
--- src/libzrtpcpp/ZrtpStates.h
|
|
+++ src/libzrtpcpp/ZrtpStates.h
|
|
@@ -58,6 +58,7 @@
|
|
int32_t processEvent(ZrtpStateClass& zsc) {
|
|
// fprintf(stdout, "ZrtpStates::processEvent, state: %d\n", state);
|
|
(zsc.*states[state].handler)();
|
|
+ return state;
|
|
}
|
|
|
|
bool inState(const int32_t s) { return ((s == state)); }
|