ZrtpCallback.h   ZrtpCallback.h 
skipping to change at line 22 skipping to change at line 22
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _ZRTPCALLBACK_H_ #ifndef _ZRTPCALLBACK_H_
#define _ZRTPCALLBACK_H_ #define _ZRTPCALLBACK_H_
#include <string> #include <string>
#include <stdint.h>
#include <libzrtpcpp/ZrtpCodes.h> #include <libzrtpcpp/ZrtpCodes.h>
/** /**
* This enum defines which role a ZRTP peer has. * This enum defines which role a ZRTP peer has.
* *
* According to the ZRTP specification the role determines which keys to * According to the ZRTP specification the role determines which keys to
* use to encrypt or decrypt SRTP data. * use to encrypt or decrypt SRTP data.
* *
* <ul> * <ul>
* <li> The Initiator encrypts SRTP data using the <em>keyInitiator</em> an d the * <li> The Initiator encrypts SRTP data using the <em>keyInitiator</em> an d the
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 ZrtpQueue.h   ZrtpQueue.h 
skipping to change at line 25 skipping to change at line 25
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _ZRTPQUEUE_H_ #ifndef _ZRTPQUEUE_H_
#define _ZRTPQUEUE_H_ #define _ZRTPQUEUE_H_
#include <ccrtp/cqueue.h> #include <ccrtp/cqueue.h>
#include <ccrtp/rtppkt.h> #include <ccrtp/rtppkt.h>
#include <libzrtpcpp/ZrtpCallback.h> #include <libzrtpcpp/ZrtpCallback.h>
#include <libzrtpcpp/TimeoutProvider.h> #include <libzrtpcpp/TimeoutProvider.h>
#include <libzrtpcpp/ZrtpConfigure.h>
class ZrtpUserCallback; class ZrtpUserCallback;
class ZRtp; class ZRtp;
#ifdef CCXX_NAMESPACES #ifdef CCXX_NAMESPACES
namespace ost { namespace ost {
#endif #endif
/** /**
* GNU ccRTP extension to support GNU ZRTP. * GNU ccRTP extension to support GNU ZRTP.
skipping to change at line 226 skipping to change at line 227
* *
* If the method could set up the timeout thread and open the ZID * If the method could set up the timeout thread and open the ZID
* file then it enables ZRTP processing and returns. * file then it enables ZRTP processing and returns.
* *
* @param zidFilename * @param zidFilename
* The name of the ZID file, can be a relative or absolut * The name of the ZID file, can be a relative or absolut
* filename. * filename.
* *
* @param autoEnable * @param autoEnable
* if set to true the method automatically sets enableZrtp to * if set to true the method automatically sets enableZrtp to
* true. This enables the ZRTP auto-sense mode. * true. This enables the ZRTP auto-sense mode. Default is true
.
*
* @param config
* this parameter points to ZRTP configuration data. If it is
* NULL then ZrtpQueue uses a default setting. Default is NULL.
* *
* @return * @return
* 1 on success, ZRTP processing enabled, -1 on failure, * 1 on success, ZRTP processing enabled, -1 on failure,
* ZRTP processing disabled. * ZRTP processing disabled.
* *
*/ */
int32_t initialize(const char *zidFilename, bool autoEnable = true) int32_t initialize(const char *zidFilename, bool autoEnable = true,
; ZrtpConfigure* config = NULL);
/* /*
* Applications use the following methods to control ZRTP, for exam ple * Applications use the following methods to control ZRTP, for exam ple
* to enable ZRTP, set flags etc. * to enable ZRTP, set flags etc.
*/ */
/** /**
* Enable or disable ZRTP processing. * Enable or disable ZRTP processing.
* *
* Call this method to enable or disable ZRTP processing after * Call this method to enable or disable ZRTP processing after
skipping to change at line 449 skipping to change at line 455
* if the application provided multi-stram parameters it may happen that * if the application provided multi-stram parameters it may happen that
* full DH mode was used. Refer to chapters 5.2 and 5.4.2 in the ZR TP # * full DH mode was used. Refer to chapters 5.2 and 5.4.2 in the ZR TP #
* when this may happen. * when this may happen.
* *
* @return * @return
* True if multi-stream is used, false otherwise. * True if multi-stream is used, false otherwise.
*/ */
bool isMultiStream(); bool isMultiStream();
/** /**
* Check if the other ZRTP client supports Multi-stream.
*
* Use this method to check if the other ZRTP client supports
* Multi-stream mode.
*
* @return
* True if multi-stream is available, false otherwise.
*/
bool isMultiStreamAvailable();
/**
* Accept a PBX enrollment request. * Accept a PBX enrollment request.
* *
* If a PBX service asks to enroll the MiTM key and the user accept s this * If a PBX service asks to enroll the MiTM key and the user accept s this
* requtes, for example by pressing an OK button, the client applic ation * requtes, for example by pressing an OK button, the client applic ation
* shall call this method and set the parameter <code>accepted</cod e> to * shall call this method and set the parameter <code>accepted</cod e> to
* true. If the user does not accept the request set the parameter to * true. If the user does not accept the request set the parameter to
* false. * false.
* *
* @param accepted * @param accepted
* True if the enrollment request is accepted, false otherwise. * True if the enrollment request is accepted, false otherwise.
skipping to change at line 706 skipping to change at line 723
* Local SSRC is given instead of computed by the queue. * Local SSRC is given instead of computed by the queue.
*/ */
ZrtpQueue(uint32 ssrc, uint32 size = ZrtpQueue(uint32 ssrc, uint32 size =
RTPDataQueue::defaultMembersHashSize, RTPDataQueue::defaultMembersHashSize,
RTPApplication& app = defaultApplication()); RTPApplication& app = defaultApplication());
virtual ~ZrtpQueue(); virtual ~ZrtpQueue();
private: private:
void init(); void init();
size_t rtpDataPacket(IncomingRTPPkt* packet, int32 rtn, size_t rtpDataPacket(unsigned char* packet, int32 rtn,
InetHostAddress network_address, InetHostAddress network_address,
tpport_t transport_port); tpport_t transport_port);
ZRtp *zrtpEngine; ZRtp *zrtpEngine;
ZrtpUserCallback* zrtpUserCallback; ZrtpUserCallback* zrtpUserCallback;
std::string clientIdString; std::string clientIdString;
bool enableZrtp; bool enableZrtp;
 End of changes. 5 change blocks. 
4 lines changed or deleted 21 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/