diff options
author | Matthew Jordan <mjordan@digium.com> | 2014-07-04 13:26:37 +0000 |
---|---|---|
committer | Matthew Jordan <mjordan@digium.com> | 2014-07-04 13:26:37 +0000 |
commit | 97834718c283d74e3571c1bf52d2840b93157cda (patch) | |
tree | a5887ff82e9f3d33c4cc1e64c0f9804dae47c295 /channels/h323/compat_h323.h | |
parent | 3bd495a688199c2db5ebc397210f06191aa59581 (diff) |
Remove many deprecated modules
Billing records are fair,
To get paid is quite bright,
You should really use ODBC;
Good-bye cdr_sqlite.
Microsoft did once push H.323,
Hell, we all remember NetMeeting.
But try to compile chan_h323 now
And you will take quite a beating.
The XMPP and SIP war was fierce,
And in the distant fray
Was birthed res_jabber/chan_jingle;
But neither to stay.
For everyone did care and chase what Google professed.
"Free Internet Calling" was what devotees cried,
But Google did change the specs so often
That the developers were happy the day chan_gtalk died.
And then there was that odd application
Dedicated to the Polish tongue.
app_saycountpl was subsumed by Say;
One could say its bell was rung.
To read and parse a file from the dialplan
You could (I guess) use an application.
app_readfile did fill that purpose, but I think
A function is perhaps better in its creation.
Barging is rude, I'm not sure why we do it.
Inwardly, the caller will probably sigh.
But if you really must do it,
Don't use app_dahdibarge, use ChanSpy.
We all despise the sound of tinny robots
It makes our queues so cold.
To control such an abomination
It's better to not use Wait/SetMusicOnHold.
It's often nice to know properties of a channel
It makes our calls right
We have a nice function called CHANNEL
And so SIPCHANINFO is sent off into the night.
And now things get odd;
Apparently one could delimit with a colon
Properties from the SIPPEER function!
Commas are in; all others are done.
Finally, a word on pipes and commas.
We're sorry. We can't say it enough.
But those compatibility options in asterisk.conf;
To maintain them forever was just too tough.
This patch removes:
* cdr_sqlite
* chan_gtalk
* chan_jingle
* chan_h323
* res_jabber
* app_saycountpl
* app_readfile
* app_dahdibarge
It removes the following applications/functions:
* WaitMusicOnHold
* SetMusicOnHold
* SIPCHANINFO
It removes the colon delimiter from the SIPPEER function.
Finally, it also removes all compatibility options that were configurable from
asterisk.conf, as these all applied to compatibility with Asterisk 1.4 systems.
Review: https://reviewboard.asterisk.org/r/3698/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@418019 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/h323/compat_h323.h')
-rw-r--r-- | channels/h323/compat_h323.h | 96 |
1 files changed, 0 insertions, 96 deletions
diff --git a/channels/h323/compat_h323.h b/channels/h323/compat_h323.h deleted file mode 100644 index 61076f1be..000000000 --- a/channels/h323/compat_h323.h +++ /dev/null @@ -1,96 +0,0 @@ -#ifndef COMPAT_H323_H -#define COMPAT_H323_H - -#include "ast_ptlib.h" - -#if VERSION(OPENH323_MAJOR,OPENH323_MINOR,OPENH323_BUILD) < VERSION(1,17,3) -/** - * Workaround for broken (less than 1.17.3) OpenH323 stack to be able to - * make TCP connections from specific address - */ -class MyH323TransportTCP : public H323TransportTCP -{ - PCLASSINFO(MyH323TransportTCP, H323TransportTCP); - -public: - MyH323TransportTCP( - H323EndPoint & endpoint, ///< H323 End Point object - PIPSocket::Address binding = PIPSocket::GetDefaultIpAny(), ///< Local interface to use - PBoolean listen = FALSE ///< Flag for need to wait for remote to connect - ); - /**Connect to the remote party. - */ - virtual PBoolean Connect(); -}; -#else -#define MyH323TransportTCP H323TransportTCP -#endif /* <VERSION(1,17,3) */ - -class MyH323TransportUDP: public H323TransportUDP -{ - PCLASSINFO(MyH323TransportUDP, H323TransportUDP); - -public: - MyH323TransportUDP(H323EndPoint &endpoint, - PIPSocket::Address binding = PIPSocket::GetDefaultIpAny(), - WORD localPort = 0, - WORD remotePort = 0): H323TransportUDP(endpoint, binding, localPort, remotePort) - { - } - virtual PBoolean DiscoverGatekeeper(H323Gatekeeper &, - H323RasPDU &, - const H323TransportAddress &); -protected: - PDECLARE_NOTIFIER(PThread, MyH323TransportUDP, DiscoverMain); - H323Gatekeeper *discoverGatekeeper; - H323RasPDU *discoverPDU; - const H323TransportAddress *discoverAddress; - PBoolean discoverResult; - PBoolean discoverReady; - PMutex discoverMutex; -}; - -template <class _Abstract_T, typename _Key_T = PString> -class MyPFactory: public PFactory<_Abstract_T, _Key_T> -{ -public: - template <class _Concrete_T> class Worker: public PFactory<_Abstract_T, _Key_T>::WorkerBase - { - public: - Worker(const _Key_T &_key, bool singleton = false) - :PFactory<_Abstract_T, _Key_T>::WorkerBase(singleton), key(_key) - { - PFactory<_Abstract_T, _Key_T>::Register(key, this); - } - ~Worker() - { - PFactory<_Abstract_T, _Key_T>::Unregister(key); - } - protected: - virtual _Abstract_T *Create(const _Key_T &) const { return new _Concrete_T; } - - private: - PString key; - }; -}; - -#ifdef H323_REGISTER_CAPABILITY -#undef H323_REGISTER_CAPABILITY -#endif -#define H323_REGISTER_CAPABILITY(cls, capName) static MyPFactory<H323Capability>::Worker<cls> cls##Factory(capName, true) - -#ifdef OPAL_MEDIA_FORMAT_DECLARE -#undef OPAL_MEDIA_FORMAT_DECLARE -#endif - -#define OPAL_MEDIA_FORMAT_DECLARE(classname, _fullName, _defaultSessionID, _rtpPayloadType, _needsJitter,_bandwidth, _frameSize, _frameTime, _timeUnits, _timeStamp) \ -class classname : public OpalMediaFormat \ -{ \ - public: \ - classname() \ - : OpalMediaFormat(_fullName, _defaultSessionID, _rtpPayloadType, _needsJitter, _bandwidth, \ - _frameSize, _frameTime, _timeUnits, _timeStamp){} \ -}; \ -static MyPFactory<OpalMediaFormat>::Worker<classname> classname##Factory(_fullName, true) - -#endif /* !defined AST_H323_H */ |