kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated to latest code used on test machines

This commit is contained in:
David Yat Sin 2012-07-30 11:07:01 -04:00
parent b1b2bee362
commit 2899b4ae95
2 changed files with 713 additions and 935 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1318
src/mod/endpoints/mod_opal/mod_opal.cpp
View File

File diff suppressed because it is too large Load Diff

330
src/mod/endpoints/mod_opal/mod_opal.h
View File

@ -4,6 +4,7 @@
* Version: MPL 1.1 * Version: MPL 1.1
* *
* Copyright (c) 2007 Tuyan Ozipek (tuyanozipek@gmail.com) * Copyright (c) 2007 Tuyan Ozipek (tuyanozipek@gmail.com)
* Copyright (c) 2008-2012 Vox Lucida Pty. Ltd. (robertj@voxlucida.com.au)
* *
* The contents of this file are subject to the Mozilla Public License Version * The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with * 1.1 (the "License"); you may not use this file except in compliance with
@ -46,6 +47,8 @@
#define HAVE_APR #define HAVE_APR
#include <switch.h> #include <switch.h>
#include <switch_version.h> #include <switch_version.h>
#define MODNAME "mod_opal" #define MODNAME "mod_opal"
@ -53,206 +56,239 @@ class FSEndPoint;
class FSManager; class FSManager;
struct mod_opal_globals { class FSProcess : public PLibraryProcess
int trace_level; {
char *codec_string; PCLASSINFO(FSProcess, PLibraryProcess);
char *context; public:
char *dialplan; FSProcess();
~FSProcess();
bool Initialise(switch_loadable_module_interface_t *iface);
FSManager & GetManager() const
{
return *m_manager;
}
protected:
FSManager * m_manager;
}; };
extern struct mod_opal_globals mod_opal_globals;
struct FSListener
{
FSListener() : m_port(H323EndPoint::DefaultTcpSignalPort) { }
PString m_name;
PIPSocket::Address m_address;
uint16_t m_port;
};
class FSProcess:public PLibraryProcess { class FSManager : public OpalManager
PCLASSINFO(FSProcess, PLibraryProcess); {
PCLASSINFO(FSManager, OpalManager);
public: public:
FSProcess(); FSManager();
~FSProcess();
bool Initialise(switch_loadable_module_interface_t *iface); bool Initialise(switch_loadable_module_interface_t *iface);
FSManager & GetManager() const { switch_status_t ReadConfig(int reload);
return *m_manager;
} protected:
FSManager * m_manager;
};
switch_endpoint_interface_t *GetSwitchInterface() const { return m_FreeSwitch; }
struct FSListener { const PString & GetContext() const { return m_context; }
FSListener() { const PString & GetDialPlan() const { return m_dialplan; }
} PString name; const PString & GetCodecPrefs() const { return m_codecPrefs; }
OpalTransportAddress listenAddress;
PString localUserName;
PString gatekeeper;
};
class FSCall:public OpalCall {
PCLASSINFO(FSCall, OpalCall);
public:
FSCall(OpalManager & manager);
virtual PBoolean OnSetUp(OpalConnection & connection);
};
class FSManager:public OpalManager {
PCLASSINFO(FSManager, OpalManager);
public:
FSManager();
bool Initialise(switch_loadable_module_interface_t *iface);
switch_status_t ReadConfig(int reload);
switch_endpoint_interface_t *GetSwitchInterface() const {
return m_FreeSwitch;
} virtual OpalCall *CreateCall(void *userData);
private: private:
switch_endpoint_interface_t *m_FreeSwitch; switch_endpoint_interface_t *m_FreeSwitch;
H323EndPoint *m_h323ep; H323EndPoint *m_h323ep;
IAX2EndPoint *m_iaxep; IAX2EndPoint *m_iaxep;
FSEndPoint *m_fsep; FSEndPoint *m_fsep;
PString m_gkAddress; PString m_context;
PString m_gkIdentifer; PString m_dialplan;
PString m_gkInterface; PString m_codecPrefs;
PString m_gkAddress;
PString m_gkIdentifer;
PString m_gkInterface;
list < FSListener > m_listeners; list <FSListener> m_listeners;
};
class FSEndPoint : public OpalLocalEndPoint
{
PCLASSINFO(FSEndPoint, OpalLocalEndPoint);
public:
FSEndPoint(FSManager & manager);
virtual OpalLocalConnection *CreateConnection(OpalCall & call, void *userData, unsigned options, OpalConnection::StringOptions * stringOptions);
FSManager & GetManager() const { return m_manager; }
protected:
FSManager & m_manager;
}; };
class FSConnection; class FSConnection;
typedef struct {
switch_timer_t read_timer;
switch_codec_t read_codec;
switch_codec_t write_codec;
switch_timer_t vid_read_timer;
switch_codec_t vid_read_codec;
switch_codec_t vid_write_codec;
FSConnection *me;
} opal_private_t;
class FSEndPoint:public OpalLocalEndPoint { class FSMediaStream : public OpalMediaStream
PCLASSINFO(FSEndPoint, OpalLocalEndPoint); {
PCLASSINFO(FSMediaStream, OpalMediaStream);
public: public:
FSEndPoint(FSManager & manager); FSMediaStream(
FSConnection & conn,
const OpalMediaFormat & mediaFormat, ///< Media format for stream
unsigned sessionID, ///< Session number for stream
bool isSource ///< Is a source stream
);
virtual bool OnIncomingCall(OpalLocalConnection &); virtual PBoolean Open();
virtual OpalLocalConnection *CreateConnection(OpalCall & call, void *userData, unsigned options, OpalConnection::StringOptions * stringOptions); virtual PBoolean IsSynchronous() const;
virtual PBoolean RequiresPatchThread(OpalMediaStream *) const;
switch_status_t read_frame(switch_frame_t **frame, switch_io_flag_t flags);
switch_status_t write_frame(const switch_frame_t *frame, switch_io_flag_t flags);
protected:
virtual void InternalClose();
int StartReadWrite(PatchPtr & mediaPatch) const;
private:
bool CheckPatchAndLock();
FSConnection &m_connection;
switch_timer_t *m_switchTimer;
switch_codec_t *m_switchCodec;
switch_frame_t m_readFrame;
RTP_DataFrame m_readRTP;
}; };
#define DECLARE_CALLBACK0(name) \ #define DECLARE_CALLBACK0(name) \
static switch_status_t name(switch_core_session_t *session) { \ static switch_status_t name(switch_core_session_t *session) { \
opal_private_t *tech_pvt = (opal_private_t *) switch_core_session_get_private(session); \ FSConnection *tech_pvt = (FSConnection *) switch_core_session_get_private(session); \
return tech_pvt && tech_pvt->me != NULL ? tech_pvt->me->name() : SWITCH_STATUS_FALSE; } \ return tech_pvt != NULL ? tech_pvt->name() : SWITCH_STATUS_FALSE; } \
switch_status_t name() switch_status_t name()
#define DECLARE_CALLBACK1(name, type1, name1) \ #define DECLARE_CALLBACK1(name, type1, name1) \
static switch_status_t name(switch_core_session_t *session, type1 name1) { \ static switch_status_t name(switch_core_session_t *session, type1 name1) { \
opal_private_t *tech_pvt = (opal_private_t *) switch_core_session_get_private(session); \ FSConnection *tech_pvt = (FSConnection *) switch_core_session_get_private(session); \
return tech_pvt && tech_pvt->me != NULL ? tech_pvt->me->name(name1) : SWITCH_STATUS_FALSE; } \ return tech_pvt != NULL ? tech_pvt->name(name1) : SWITCH_STATUS_FALSE; } \
switch_status_t name(type1 name1) switch_status_t name(type1 name1)
#define DECLARE_CALLBACK3(name, type1, name1, type2, name2, type3, name3) \ #define DECLARE_CALLBACK3(name, type1, name1, type2, name2, type3, name3) \
static switch_status_t name(switch_core_session_t *session, type1 name1, type2 name2, type3 name3) { \ static switch_status_t name(switch_core_session_t *session, type1 name1, type2 name2, type3 name3) { \
opal_private_t *tech_pvt = (opal_private_t *) switch_core_session_get_private(session); \ FSConnection *tech_pvt = (FSConnection *) switch_core_session_get_private(session); \
return tech_pvt && tech_pvt->me != NULL ? tech_pvt->me->name(name1, name2, name3) : SWITCH_STATUS_FALSE; } \ return tech_pvt != NULL ? tech_pvt->name(name1, name2, name3) : SWITCH_STATUS_FALSE; } \
switch_status_t name(type1 name1, type2 name2, type3 name3) switch_status_t name(type1 name1, type2 name2, type3 name3)
class FSConnection:public OpalLocalConnection { class FSConnection : public OpalLocalConnection
PCLASSINFO(FSConnection, OpalLocalConnection) {
PCLASSINFO(FSConnection, OpalLocalConnection)
public: public:
FSConnection(OpalCall & call, struct outgoing_params {
FSEndPoint & endpoint, switch_event_t *var_event;
void *userData, switch_caller_profile_t *outbound_profile;
unsigned options, switch_core_session_t **new_session;
OpalConnection::StringOptions * stringOptions, switch_memory_pool_t **pool;
switch_caller_profile_t *outbound_profile, switch_core_session_t *fsSession, switch_channel_t *fsChannel); switch_originate_flag_t flags;
switch_call_cause_t *cancel_cause;
switch_call_cause_t fail_cause;
};
virtual bool OnIncoming(); FSConnection(OpalCall & call,
virtual void OnReleased(); FSEndPoint & endpoint,
virtual PBoolean SetAlerting(const PString & calleeName, PBoolean withMedia); unsigned options,
virtual void OnAlerting(); OpalConnection::StringOptions * stringOptions,
virtual void OnEstablished(); outgoing_params * params);
virtual OpalMediaStream *CreateMediaStream(const OpalMediaFormat &, unsigned, PBoolean);
virtual PBoolean OnOpenMediaStream(OpalMediaStream & stream);
virtual OpalMediaFormatList GetMediaFormats() const;
virtual PBoolean SendUserInputTone(char tone, unsigned duration);
virtual PBoolean SendUserInputString(const PString & value);
void SetCodecs(); virtual bool OnOutgoingSetUp();
virtual bool OnIncoming();
virtual void OnReleased();
virtual PBoolean SetAlerting(const PString & calleeName, PBoolean withMedia);
virtual OpalMediaStream *CreateMediaStream(const OpalMediaFormat &, unsigned, PBoolean);
virtual void OnPatchMediaStream(PBoolean isSource, OpalMediaPatch & patch);
virtual OpalMediaFormatList GetMediaFormats() const;
virtual PBoolean SendUserInputTone(char tone, unsigned duration);
DECLARE_CALLBACK0(on_init); void SetCodecs();
DECLARE_CALLBACK0(on_routing); bool WaitForMedia();
DECLARE_CALLBACK0(on_execute);
DECLARE_CALLBACK0(on_exchange_media); DECLARE_CALLBACK0(on_init);
DECLARE_CALLBACK0(on_soft_execute); DECLARE_CALLBACK0(on_destroy);
DECLARE_CALLBACK0(on_routing);
DECLARE_CALLBACK0(on_execute);
DECLARE_CALLBACK0(on_hangup);
DECLARE_CALLBACK1(kill_channel, int, sig); DECLARE_CALLBACK0(on_exchange_media);
DECLARE_CALLBACK1(send_dtmf, const switch_dtmf_t *, dtmf); DECLARE_CALLBACK0(on_soft_execute);
DECLARE_CALLBACK1(receive_message, switch_core_session_message_t *, msg);
DECLARE_CALLBACK1(receive_event, switch_event_t *, event);
DECLARE_CALLBACK0(state_change);
DECLARE_CALLBACK3(read_audio_frame, switch_frame_t **, frame, switch_io_flag_t, flags, int, stream_id);
DECLARE_CALLBACK3(write_audio_frame, switch_frame_t *, frame, switch_io_flag_t, flags, int, stream_id);
DECLARE_CALLBACK3(read_video_frame, switch_frame_t **, frame, switch_io_flag_t, flag, int, stream_id);
DECLARE_CALLBACK3(write_video_frame, switch_frame_t *, frame, switch_io_flag_t, flag, int, stream_id);
switch_status_t read_frame(const OpalMediaType & mediaType, switch_frame_t **frame, switch_io_flag_t flags); DECLARE_CALLBACK1(kill_channel, int, sig);
switch_status_t write_frame(const OpalMediaType & mediaType, const switch_frame_t *frame, switch_io_flag_t flags); DECLARE_CALLBACK1(send_dtmf, const switch_dtmf_t *, dtmf);
DECLARE_CALLBACK1(receive_message, switch_core_session_message_t *, msg);
DECLARE_CALLBACK1(receive_event, switch_event_t *, event);
DECLARE_CALLBACK0(state_change);
DECLARE_CALLBACK3(read_audio_frame, switch_frame_t **, frame, switch_io_flag_t, flags, int, stream_id);
DECLARE_CALLBACK3(write_audio_frame, switch_frame_t *, frame, switch_io_flag_t, flags, int, stream_id);
DECLARE_CALLBACK3(read_video_frame, switch_frame_t **, frame, switch_io_flag_t, flag, int, stream_id);
DECLARE_CALLBACK3(write_video_frame, switch_frame_t *, frame, switch_io_flag_t, flag, int, stream_id);
switch_core_session_t *GetSession() const { switch_status_t read_frame(const OpalMediaType & mediaType, switch_frame_t **frame, switch_io_flag_t flags);
return m_fsSession; switch_status_t write_frame(const OpalMediaType & mediaType, const switch_frame_t *frame, switch_io_flag_t flags);
} private:
FSEndPoint & m_endpoint;
switch_core_session_t *m_fsSession;
switch_channel_t *m_fsChannel;
PSyncPoint m_rxAudioOpened;
PSyncPoint m_txAudioOpened;
OpalMediaFormatList m_switchMediaFormats;
};
__inline switch_core_session_t *GetSession() const
{
return m_fsSession;
}
class FSMediaStream:public OpalMediaStream { __inline switch_channel_t *GetChannel() const
PCLASSINFO(FSMediaStream, OpalMediaStream); {
public: return m_fsChannel;
FSMediaStream(FSConnection & conn, const OpalMediaFormat & mediaFormat, ///< Media format for stream }
unsigned sessionID, ///< Session number for stream
bool isSource ///< Is a source stream
);
virtual PBoolean Open(); bool IsChannelReady() const
virtual PBoolean Close(); {
virtual PBoolean IsSynchronous() const; return m_fsChannel != NULL && switch_channel_ready(m_fsChannel);
virtual PBoolean RequiresPatchThread(OpalMediaStream *) const; }
switch_status_t read_frame(switch_frame_t **frame, switch_io_flag_t flags); bool NeedFlushAudio()
switch_status_t write_frame(const switch_frame_t *frame, switch_io_flag_t flags); {
if (!m_flushAudio)
return false;
m_flushAudio = false;
return true;
}
private: private:
switch_core_session_t *m_fsSession; FSEndPoint &m_endpoint;
switch_channel_t *m_fsChannel; switch_core_session_t *m_fsSession;
switch_timer_t *m_switchTimer; switch_channel_t *m_fsChannel;
switch_codec_t *m_switchCodec; PSyncPoint m_rxAudioOpened;
switch_frame_t m_readFrame; PSyncPoint m_txAudioOpened;
unsigned char m_buf[SWITCH_RECOMMENDED_BUFFER_SIZE]; OpalMediaFormatList m_switchMediaFormats;
RTP_DataFrame m_readRTP;
bool m_callOnStart;
uint32_t m_timeStamp;
bool CheckPatchAndLock(); // If FS ever supports more than one audio and one video, this needs to change
switch_timer_t m_read_timer;
switch_codec_t m_read_codec;
switch_codec_t m_write_codec;
switch_timer_t m_vid_read_timer;
switch_codec_t m_vid_read_codec;
switch_codec_t m_vid_write_codec;
bool m_flushAudio;
friend PBoolean FSMediaStream::Open();
}; };