- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13758 - freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp
by FreeSWITCH SVN 11 Jun '09

11 Jun '09

Author: jmesquita Date: Thu Jun 11 11:38:51 2009 New Revision: 13758 Log: Make API more sane, since we are going to display lots of other things. Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp ============================================================================== --- freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp (original) +++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp Thu Jun 11 11:38:51 2009 @@ -30,7 +30,7 @@ * */ -#define KHOMP_SYNTAX "khomp [status]" +#define KHOMP_SYNTAX "khomp [show]" /* Our includes */ #include "k3lapi.hpp" @@ -123,6 +123,9 @@ static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id); static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig); +/* My function prototypes */ +static void printBoardsInfo(switch_stream_handle_t*); + static void tech_init(private_t *tech_pvt, switch_core_session_t *session) @@ -642,116 +645,122 @@ goto done; } - if (argv[0] && !strncasecmp(argv[0], "status", 6)) { - K3L_API_CONFIG apiCfg; + if (argv[0] && !strncasecmp(argv[0], "show", 6)) { + printBoardsInfo(stream); - stream->write_function(stream," ------------------------------------------------------------------\n"); - stream->write_function(stream, "|---------------------- Khomp System Summary ----------------------|\n"); - stream->write_function(stream, "|------------------------------------------------------------------|\n"); + } else { + stream->write_function(stream, "USAGE: %s\n", KHOMP_SYNTAX); + } - if (k3lGetDeviceConfig(-1, ksoAPI, &apiCfg, sizeof(apiCfg)) == ksSuccess) - { - stream->write_function(stream, "| K3L API %d.%d.%d [m.VPD %d] - %-38s |\n" - , apiCfg.MajorVersion , apiCfg.MinorVersion , apiCfg.BuildVersion - , apiCfg.VpdVersionNeeded , apiCfg.StrVersion); - } +done: + switch_safe_free(myarg); + return status; - for (unsigned int i = 0; i < k3l->device_count(); i++) - { - K3L_DEVICE_CONFIG & devCfg = k3l->device_config(i); +} - stream->write_function(stream, " ------------------------------------------------------------------\n"); +static void printBoardsInfo(switch_stream_handle_t* stream) { - switch (k3l->device_type(i)) - { - /* E1 boards */ - case kdtE1: - case kdtConf: - case kdtPR: - case kdtE1GW: - case kdtE1IP: - case kdtE1Spx: - case kdtGWIP: - case kdtFXS: - case kdtFXSSpx: - { - K3L_E1600A_FW_CONFIG dspAcfg; - K3L_E1600B_FW_CONFIG dspBcfg; + K3L_API_CONFIG apiCfg; - if ((k3lGetDeviceConfig(i, ksoFirmware + kfiE1600A, &dspAcfg, sizeof(dspAcfg)) == ksSuccess) && - (k3lGetDeviceConfig(i, ksoFirmware + kfiE1600B, &dspBcfg, sizeof(dspBcfg)) == ksSuccess)) - { - stream->write_function(stream, "| [[ %02d ]] %s, serial '%04d', %02d channels, %d links.|\n" - , i , "E1" , atoi(devCfg.SerialNumber) , devCfg.ChannelCount , devCfg.LinkCount); - stream->write_function(stream, "| * DSP A: %s, DSP B: %s - PCI bus: %02d, PCI slot: %02d %s|\n" - , dspAcfg.DspVersion , dspBcfg.DspVersion , devCfg.PciBus , devCfg.PciSlot - , std::string(18 - strlen(dspAcfg.DspVersion) - strlen(dspBcfg.DspVersion), ' ').c_str()); - stream->write_function(stream, "| * %-62s |\n" , dspAcfg.FwVersion); - stream->write_function(stream, "| * %-62s |\n" , dspBcfg.FwVersion); + stream->write_function(stream," ------------------------------------------------------------------\n"); + stream->write_function(stream, "|---------------------- Khomp System Summary ----------------------|\n"); + stream->write_function(stream, "|------------------------------------------------------------------|\n"); + + if (k3lGetDeviceConfig(-1, ksoAPI, &apiCfg, sizeof(apiCfg)) == ksSuccess) + { + stream->write_function(stream, "| K3L API %d.%d.%d [m.VPD %d] - %-38s |\n" + , apiCfg.MajorVersion , apiCfg.MinorVersion , apiCfg.BuildVersion + , apiCfg.VpdVersionNeeded , apiCfg.StrVersion); + } - } + for (unsigned int i = 0; i < k3l->device_count(); i++) + { + K3L_DEVICE_CONFIG & devCfg = k3l->device_config(i); - break; - } + stream->write_function(stream, " ------------------------------------------------------------------\n"); - /* analog boards */ - case kdtFXO: - case kdtFXOVoIP: - { - K3L_FXO80_FW_CONFIG dspCfg; + switch (k3l->device_type(i)) + { + /* E1 boards */ + case kdtE1: + case kdtConf: + case kdtPR: + case kdtE1GW: + case kdtE1IP: + case kdtE1Spx: + case kdtGWIP: + case kdtFXS: + case kdtFXSSpx: + { + K3L_E1600A_FW_CONFIG dspAcfg; + K3L_E1600B_FW_CONFIG dspBcfg; - if (k3lGetDeviceConfig(i, ksoFirmware + kfiFXO80, &dspCfg, sizeof(dspCfg)) == ksSuccess) - { - stream->write_function(stream, "| [[ %02d ]] %s, serial '%04d', %02d channels. %s|\n" - , i , "KFXO80" , atoi(devCfg.SerialNumber) , devCfg.ChannelCount - , std::string(26 - 6, ' ').c_str()); - stream->write_function(stream, "| * DSP: %s - PCI bus: %02d, PCI slot: %02d%s|\n" - , dspCfg.DspVersion , devCfg.PciBus , devCfg.PciSlot - , std::string(30 - strlen(dspCfg.DspVersion), ' ').c_str()); - stream->write_function(stream, "| * %-62s |\n" , dspCfg.FwVersion); - } + if ((k3lGetDeviceConfig(i, ksoFirmware + kfiE1600A, &dspAcfg, sizeof(dspAcfg)) == ksSuccess) && + (k3lGetDeviceConfig(i, ksoFirmware + kfiE1600B, &dspBcfg, sizeof(dspBcfg)) == ksSuccess)) + { + stream->write_function(stream, "| [[ %02d ]] %s, serial '%04d', %02d channels, %d links.|\n" + , i , "E1" , atoi(devCfg.SerialNumber) , devCfg.ChannelCount , devCfg.LinkCount); + stream->write_function(stream, "| * DSP A: %s, DSP B: %s - PCI bus: %02d, PCI slot: %02d %s|\n" + , dspAcfg.DspVersion , dspBcfg.DspVersion , devCfg.PciBus , devCfg.PciSlot + , std::string(18 - strlen(dspAcfg.DspVersion) - strlen(dspBcfg.DspVersion), ' ').c_str()); + stream->write_function(stream, "| * %-62s |\n" , dspAcfg.FwVersion); + stream->write_function(stream, "| * %-62s |\n" , dspBcfg.FwVersion); } - case kdtGSM: - case kdtGSMSpx: - { - K3L_GSM40_FW_CONFIG dspCfg; - - if (k3lGetDeviceConfig(i, ksoFirmware + kfiGSM40, &dspCfg, sizeof(dspCfg)) == ksSuccess) - { - stream->write_function(stream, "| [[ %02d ]] %s, serial '%04d', %02d channels. %s|\n" - , i , "KGSM" , atoi(devCfg.SerialNumber) , devCfg.ChannelCount - , std::string(26 - 4, ' ').c_str()); - - stream->write_function(stream, "| * DSP: %s - PCI bus: %02d, PCI slot: %02d%s|\n" - , dspCfg.DspVersion , devCfg.PciBus , devCfg.PciSlot - , std::string(30 - strlen(dspCfg.DspVersion), ' ').c_str()); + break; + } - stream->write_function(stream, "| * %-62s |\n" , dspCfg.FwVersion); - } + /* analog boards */ + case kdtFXO: + case kdtFXOVoIP: + { + K3L_FXO80_FW_CONFIG dspCfg; - break; + if (k3lGetDeviceConfig(i, ksoFirmware + kfiFXO80, &dspCfg, sizeof(dspCfg)) == ksSuccess) + { + stream->write_function(stream, "| [[ %02d ]] %s, serial '%04d', %02d channels. %s|\n" + , i , "KFXO80" , atoi(devCfg.SerialNumber) , devCfg.ChannelCount + , std::string(26 - 6, ' ').c_str()); + stream->write_function(stream, "| * DSP: %s - PCI bus: %02d, PCI slot: %02d%s|\n" + , dspCfg.DspVersion , devCfg.PciBus , devCfg.PciSlot + , std::string(30 - strlen(dspCfg.DspVersion), ' ').c_str()); + stream->write_function(stream, "| * %-62s |\n" , dspCfg.FwVersion); } - default: - stream->write_function(stream, "| [[ %02d ]] Unknown type '%02d'! Please contact Khomp support for help! |\n" - , i , k3l->device_type(i)); - break; + } - } - stream->write_function(stream, " ------------------------------------------------------------------\n"); + case kdtGSM: + case kdtGSMSpx: + { + K3L_GSM40_FW_CONFIG dspCfg; - } else { - stream->write_function(stream, "USAGE: %s\n", KHOMP_SYNTAX); - } + if (k3lGetDeviceConfig(i, ksoFirmware + kfiGSM40, &dspCfg, sizeof(dspCfg)) == ksSuccess) + { + stream->write_function(stream, "| [[ %02d ]] %s, serial '%04d', %02d channels. %s|\n" + , i , "KGSM" , atoi(devCfg.SerialNumber) , devCfg.ChannelCount + , std::string(26 - 4, ' ').c_str()); + + stream->write_function(stream, "| * DSP: %s - PCI bus: %02d, PCI slot: %02d%s|\n" + , dspCfg.DspVersion , devCfg.PciBus , devCfg.PciSlot + , std::string(30 - strlen(dspCfg.DspVersion), ' ').c_str()); -done: - switch_safe_free(myarg); - return status; + stream->write_function(stream, "| * %-62s |\n" , dspCfg.FwVersion); + } + break; + } + default: + stream->write_function(stream, "| [[ %02d ]] Unknown type '%02d'! Please contact Khomp support for help! |\n" + , i , k3l->device_type(i)); + break; + } + } + + stream->write_function(stream, " ------------------------------------------------------------------\n"); } + /* For Emacs: * Local Variables: * mode:c

1 0

[commit] r13757 - in freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons: . include
by FreeSWITCH SVN 11 Jun '09

11 Jun '09

Author: jmesquita Date: Thu Jun 11 11:10:52 2009 New Revision: 13757 Log: Forgot to add a few things b4 commit Added: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/include/ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/include/k3lapi.hpp freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/k3lapi.cpp Added: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/include/k3lapi.hpp ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/include/k3lapi.hpp Thu Jun 11 11:10:52 2009 @@ -0,0 +1,201 @@ +#include <string> + +#include <k3l.h> + +#ifndef KHOMP_COMMONS_WITH_CHANNEL +# include <k3lVersion.h> +#endif + +#ifdef __GNUC_PREREQ +#if __GNUC_PREREQ(4,3) +#include <cstring> +#endif +#endif + +#ifndef INCLUDED_K3LAPI_HPP +#define INCLUDED_K3LAPI_HPP + +struct K3LAPI +{ + /* exceptions */ + + struct start_failed + { + start_failed(const char * _msg) : msg(_msg) {}; + std::string msg; + }; + + struct failed_command + { + failed_command(int32 _code, unsigned int _dev, unsigned int _obj, int32 _rc) + : code(_code), dev(_dev), obj(_obj), rc(_rc) {}; + + int32 code; + unsigned int dev; + unsigned int obj; + int32 rc; + }; + + struct failed_raw_command + { + failed_raw_command(unsigned int _dev, unsigned int _dsp, int32 _rc) + : dev(_dev), dsp(_dsp), rc(_rc) {}; + + unsigned int dev; + unsigned int dsp; + int32 rc; + }; + + struct invalid_device + { + invalid_device(unsigned int _device) + : device(_device) {}; + + unsigned int device; + }; + + struct invalid_channel + { + invalid_channel(unsigned int _device, unsigned int _channel) + : device(_device), channel(_channel) {}; + + unsigned int device, channel; + }; + + struct invalid_link + { + invalid_link(unsigned int _device, unsigned int _link) + : device(_device), link(_link) {}; + + unsigned int device, link; + }; + + struct get_param_failed + { + get_param_failed(std::string _name, int32 _rc) + : name(_name), rc((KLibraryStatus)_rc) {}; + + std::string name; + KLibraryStatus rc; + }; + + typedef K3L_DEVICE_CONFIG device_conf_type; + typedef K3L_CHANNEL_CONFIG channel_conf_type; + typedef K3L_CHANNEL_CONFIG * channel_ptr_conf_type; + typedef K3L_LINK_CONFIG link_conf_type; + typedef K3L_LINK_CONFIG * link_ptr_conf_type; + + /* constructors/destructors */ + + K3LAPI(); + ~K3LAPI(); + + /* (init|final)ialize the whole thing! */ + + void start(void); + void stop(void); + + /* verificacao de intervalos */ + + inline bool valid_device( unsigned int dev ) + { + return (dev < _device_count); + } + + inline bool valid_channel( unsigned int dev, unsigned int obj ) + { + return (valid_device(dev) && obj < _channel_count[dev]); + } + + inline bool valid_link( unsigned int dev, unsigned int obj ) + { + return (valid_device(dev) && obj < _link_count[dev]); + } + + /* envio de comandos para placa */ + + void mixer(int32 dev, int32 obj, byte track, KMixerSource src, int32 index); + void mixerCTbus(int32 dev, int32 obj, byte track, KMixerSource src, int32 index); + void command (int32 dev, int32 obj, int32 code, std::string & str); + void command (int32 dev, int32 obj, int32 code, const char * parms = NULL); + void raw_command(int32 dev, int32 dsp, std::string & str); + void raw_command(int32 dev, int32 dsp, const char * cmds, int32 size); + + /* obter dados 'cacheados' */ + + inline unsigned int device_count(void) + { + return _device_count; + } + + inline unsigned int channel_count(unsigned int dev) + { + if (!valid_device(dev)) + throw invalid_device(dev); + + return _channel_count[dev]; + } + + inline unsigned int link_count(unsigned int dev) + { + if (!valid_device(dev)) + throw invalid_device(dev); + + return _link_count[dev]; + } + + KDeviceType device_type(unsigned int dev) + { + if (!valid_device(dev)) + throw invalid_device(dev); + + return _device_type[dev]; + } + + + K3L_DEVICE_CONFIG & device_config(unsigned int dev) + { + if (!valid_device(dev)) + throw invalid_device(dev); + + return _device_config[dev]; + } + + K3L_CHANNEL_CONFIG & channel_config(unsigned int dev, unsigned int obj) + { + if (!valid_channel(dev, obj)) + throw invalid_channel(dev, obj); + + return _channel_config[dev][obj]; + } + + K3L_LINK_CONFIG & link_config(unsigned int dev, unsigned int obj) + { + if (!valid_channel(dev, obj)) + throw invalid_channel(dev, obj); + + return _link_config[dev][obj]; + } + + /* pega valores em strings de eventos */ + + KLibraryStatus get_param(K3L_EVENT *ev, const char *name, std::string &res); + std::string get_param(K3L_EVENT *ev, const char *name); + + /* inicializa valores em cache */ + + void init(void); + + protected: + + unsigned int _device_count; + unsigned int * _channel_count; + unsigned int * _link_count; + + device_conf_type * _device_config; + channel_ptr_conf_type * _channel_config; + link_ptr_conf_type * _link_config; + KDeviceType * _device_type; +}; + +#endif /* INCLUDED_K3LAPI_HPP */ Added: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/k3lapi.cpp ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/k3lapi.cpp Thu Jun 11 11:10:52 2009 @@ -0,0 +1,171 @@ +#include <k3lapi.hpp> + +K3LAPI::K3LAPI() +: _device_count(0), _channel_count(0), _link_count(0), + _device_config(0), _channel_config(0), _link_config(0) +{} + +K3LAPI::~K3LAPI() +{ + _device_count = 0; + + if (_device_type) { delete[] _device_type; _device_type = NULL; } + if (_device_config) { delete[] _device_config; _device_config = NULL; } + if (_channel_config) { delete[] _channel_config; _channel_config = NULL; } + if (_link_config) { delete[] _link_config; _link_config = NULL; } + if (_channel_count) { delete[] _channel_count; _channel_count = NULL; } + if (_link_count) { delete[] _link_count; _link_count = NULL; } +} + +/* initialize the whole thing! */ + +void K3LAPI::start(void) +{ + /* tie the used k3l to the compiled k3l version */ + char *ret = k3lStart(k3lApiMajorVersion, k3lApiMinorVersion, 0); //k3lApiBuildVersion); + + if (ret && *ret) + throw start_failed(ret); + + /* call init automagically */ + init(); +} + +void K3LAPI::stop(void) +{ + k3lStop(); +} + +/* envio de comandos para placa */ + +void K3LAPI::mixer(int32 dev, int32 obj, byte track, KMixerSource src, int32 index) +{ + KMixerCommand mix; + + mix.Track = track; + mix.Source = src; + mix.SourceIndex = index; + + command(dev, obj, CM_MIXER, (const char *) &mix); +} + +void K3LAPI::mixerCTbus(int32 dev, int32 obj, byte track, KMixerSource src, int32 index) +{ + KMixerCommand mix; + + mix.Track = track; + mix.Source = src; + mix.SourceIndex = index; + + command(dev, obj, CM_MIXER_CTBUS, (const char *) &mix); +} + +void K3LAPI::command(int32 dev, int32 obj, int32 code, std::string & str) +{ + command(dev, obj, code, str.c_str()); +} + +void K3LAPI::command (int32 dev, int32 obj, int32 code, const char * parms) +{ + K3L_COMMAND cmd; + + cmd.Cmd = code; + cmd.Object = obj; + cmd.Params = (byte *)parms; + + int32 rc = k3lSendCommand(dev, &cmd); + + if (rc != ksSuccess) + throw failed_command(code, dev, obj, rc); +} + +void K3LAPI::raw_command(int32 dev, int32 dsp, std::string & str) +{ + raw_command(dev, dsp, str.data(), str.size()); +} + +void K3LAPI::raw_command(int32 dev, int32 dsp, const char * cmds, int32 size) +{ + std::string str(cmds, size); + + int32 rc = k3lSendRawCommand(dev, dsp, (void *)cmds, size); + + if (rc != ksSuccess) + throw failed_raw_command(dev, dsp, rc); +} + +KLibraryStatus K3LAPI::get_param(K3L_EVENT *ev, const char *name, std::string &res) +{ + char tmp_param[256]; + memset((void*)tmp_param, 0, sizeof(tmp_param)); + + int32 rc = k3lGetEventParam (ev, (sbyte *)name, (sbyte *)tmp_param, sizeof(tmp_param)-1); + + if (rc != ksSuccess) + return (KLibraryStatus)rc; + + res.append(tmp_param, strlen(tmp_param)); + return ksSuccess; +} + +std::string K3LAPI::get_param(K3L_EVENT *ev, const char *name) +{ + std::string res; + + KLibraryStatus rc = get_param(ev, name, res); + + if (rc != ksSuccess) + throw get_param_failed(name, rc); + + return res; +} + +void K3LAPI::init(void) +{ + if (_device_count != 0) return; + + _device_count = k3lGetDeviceCount(); + + _device_type = new KDeviceType[_device_count]; + _device_config = new device_conf_type[_device_count]; + _channel_config = new channel_ptr_conf_type[_device_count]; + _link_config = new link_ptr_conf_type[_device_count]; + _channel_count = new unsigned int[_device_count]; + _link_count = new unsigned int[_device_count]; + + for (unsigned int dev = 0; dev < _device_count; dev++) + { + _device_type[dev] = (KDeviceType) k3lGetDeviceType(dev); + + /* caches each device config */ + if (k3lGetDeviceConfig(dev, ksoDevice + dev, &(_device_config[dev]), sizeof(_device_config[dev])) != ksSuccess) + throw start_failed("k3lGetDeviceConfig(device)"); + + /* adjust channel/link count for device */ + _channel_count[dev] = _device_config[dev].ChannelCount; + _link_count[dev] = _device_config[dev].LinkCount; + + /* caches each channel config */ + _channel_config[dev] = new channel_conf_type[_channel_count[dev]]; + + for (unsigned int obj = 0; obj < _channel_count[dev]; obj++) + { + if (k3lGetDeviceConfig(dev, ksoChannel + obj, &(_channel_config[dev][obj]), + sizeof(_channel_config[dev][obj])) != ksSuccess) + throw start_failed("k3lGetDeviceConfig(channel)"); + } + + /* adjust link count for device */ + _link_count[dev] = _device_config[dev].LinkCount; + + /* caches each link config */ + _link_config[dev] = new link_conf_type[_link_count[dev]]; + + for (unsigned int obj = 0; obj < _link_count[dev]; obj++) + { + if (k3lGetDeviceConfig(dev, ksoLink + obj, &(_link_config[dev][obj]), + sizeof(_link_config[dev][obj])) != ksSuccess) + throw start_failed("k3lGetDeviceConfig(link)"); + } + } +}

1 0

[commit] r13756 - freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp
by FreeSWITCH SVN 11 Jun '09

11 Jun '09

Author: jmesquita Date: Thu Jun 11 11:10:03 2009 New Revision: 13756 Log: My first API to show board information Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile ============================================================================== --- freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile (original) +++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile Thu Jun 11 11:10:03 2009 @@ -1,4 +1,6 @@ MODNAME=mod_khomp -LOCAL_CFLAGS=-I./include -lk3l -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM -lboost_thread -lboost_regex +LOCAL_CFLAGS=-I./include -I./commons/include -lk3l -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM -DKHOMP_COMMONS_WITH_CHANNEL -lboost_thread -lboost_regex + +LOCAL_OBJS= ./commons/k3lapi.o include ../../../../build/modmake.rules Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp ============================================================================== --- freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp (original) +++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp Thu Jun 11 11:10:03 2009 @@ -30,8 +30,10 @@ * */ +#define KHOMP_SYNTAX "khomp [status]" + /* Our includes */ -#include "k3l.h" +#include "k3lapi.hpp" extern "C" { @@ -48,6 +50,8 @@ static switch_memory_pool_t *module_pool = NULL; static int running = 1; +static K3LAPI * k3l; + typedef enum { TFLAG_IO = (1 << 0), @@ -103,6 +107,8 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_rates_string, globals.codec_rates_string); SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_ip, globals.ip); +/* Macros to define specific API functions */ +SWITCH_STANDARD_API(khomp); static switch_status_t channel_on_init(switch_core_session_t *session); @@ -534,49 +540,6 @@ return SWITCH_STATUS_SUCCESS; } -bool start_k3l(void) -{ - k3lSetGlobalParam (klpResetFwOnStartup, 1); - k3lSetGlobalParam (klpDisableInternalVoIP, 1); - - sbyte *Erro = k3lStart( 2,0,0 ); - - if ( Erro ) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "loading K3L API failed: %s.\n", Erro); - return false; - } - - int _boardCount = k3lGetDeviceCount(); - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Number of boards: %d.\n", _boardCount); - - /* No boards */ - if(_boardCount == 0){ - k3lStop(); - return false; - } - -/* _boards = new Board*[ _boardCount ]; - - for( int i = 0; i < _boardCount; i++ ) - _boards[ i ] = new Board( i ); - - - if(handler) - RegisterHandler((void *)EventCallBack); */ - - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "the K3L API have been started!\n"); - - bool is_ok = true; - - if (!is_ok) - return false; - - return true; -}; - - SWITCH_MODULE_LOAD_FUNCTION(mod_khomp_load) { @@ -586,15 +549,33 @@ load_config(); + switch_api_interface_t *api_interface; + *module_interface = switch_loadable_module_create_module_interface(pool, "mod_khomp"); khomp_endpoint_interface = static_cast<switch_endpoint_interface_t*>(switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE)); khomp_endpoint_interface->interface_name = "khomp"; khomp_endpoint_interface->io_routines = &khomp_io_routines; khomp_endpoint_interface->state_handler = &khomp_state_handlers; - if (!start_k3l()) { - return SWITCH_STATUS_FALSE; - } + /* + Spawn our k3l global var that will be used along the module + for sending info to the boards + */ + k3l = new K3LAPI(); + + /* Start the API and connect to KServer */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Starting K3L...\n"); + try { + k3l->start(); + } catch (...) { + /* TODO: Catch the proper error and display it. */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "K3L not started."); + return SWITCH_STATUS_TERM; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "K3L started.\n"); + + /* Add all the specific API functions */ + SWITCH_ADD_API(api_interface, "khomp", "Khomp Menu", khomp, KHOMP_SYNTAX); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; @@ -628,12 +609,149 @@ /* Finnish him! */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stopping K3L...\n"); - k3lStop(); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "the K3L API have been stopped!\n"); + k3l->stop(); + delete k3l; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "the K3L API has been stopped!\n"); return SWITCH_STATUS_SUCCESS; } +/* + khomp API + Only displays board information right now +*/ + +SWITCH_STANDARD_API(khomp) +{ + char *argv[10] = { 0 }; + int argc = 0; + void *val; + char *myarg = NULL; + switch_status_t status = SWITCH_STATUS_SUCCESS; + + /* We should not ever get a session here */ + if (session) return status; + + if (switch_strlen_zero(cmd) || !(myarg = strdup(cmd))) { + stream->write_function(stream, "USAGE: %s\n", KHOMP_SYNTAX); + return SWITCH_STATUS_FALSE; + } + + if ((argc = switch_separate_string(myarg, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) != 1) { + stream->write_function(stream, "USAGE: %s\n", KHOMP_SYNTAX); + goto done; + } + + if (argv[0] && !strncasecmp(argv[0], "status", 6)) { + K3L_API_CONFIG apiCfg; + + stream->write_function(stream," ------------------------------------------------------------------\n"); + stream->write_function(stream, "|---------------------- Khomp System Summary ----------------------|\n"); + stream->write_function(stream, "|------------------------------------------------------------------|\n"); + + if (k3lGetDeviceConfig(-1, ksoAPI, &apiCfg, sizeof(apiCfg)) == ksSuccess) + { + stream->write_function(stream, "| K3L API %d.%d.%d [m.VPD %d] - %-38s |\n" + , apiCfg.MajorVersion , apiCfg.MinorVersion , apiCfg.BuildVersion + , apiCfg.VpdVersionNeeded , apiCfg.StrVersion); + } + + for (unsigned int i = 0; i < k3l->device_count(); i++) + { + K3L_DEVICE_CONFIG & devCfg = k3l->device_config(i); + + stream->write_function(stream, " ------------------------------------------------------------------\n"); + + switch (k3l->device_type(i)) + { + /* E1 boards */ + case kdtE1: + case kdtConf: + case kdtPR: + case kdtE1GW: + case kdtE1IP: + case kdtE1Spx: + case kdtGWIP: + case kdtFXS: + case kdtFXSSpx: + { + K3L_E1600A_FW_CONFIG dspAcfg; + K3L_E1600B_FW_CONFIG dspBcfg; + + if ((k3lGetDeviceConfig(i, ksoFirmware + kfiE1600A, &dspAcfg, sizeof(dspAcfg)) == ksSuccess) && + (k3lGetDeviceConfig(i, ksoFirmware + kfiE1600B, &dspBcfg, sizeof(dspBcfg)) == ksSuccess)) + { + stream->write_function(stream, "| [[ %02d ]] %s, serial '%04d', %02d channels, %d links.|\n" + , i , "E1" , atoi(devCfg.SerialNumber) , devCfg.ChannelCount , devCfg.LinkCount); + stream->write_function(stream, "| * DSP A: %s, DSP B: %s - PCI bus: %02d, PCI slot: %02d %s|\n" + , dspAcfg.DspVersion , dspBcfg.DspVersion , devCfg.PciBus , devCfg.PciSlot + , std::string(18 - strlen(dspAcfg.DspVersion) - strlen(dspBcfg.DspVersion), ' ').c_str()); + stream->write_function(stream, "| * %-62s |\n" , dspAcfg.FwVersion); + stream->write_function(stream, "| * %-62s |\n" , dspBcfg.FwVersion); + + } + + break; + } + + /* analog boards */ + case kdtFXO: + case kdtFXOVoIP: + { + K3L_FXO80_FW_CONFIG dspCfg; + + if (k3lGetDeviceConfig(i, ksoFirmware + kfiFXO80, &dspCfg, sizeof(dspCfg)) == ksSuccess) + { + stream->write_function(stream, "| [[ %02d ]] %s, serial '%04d', %02d channels. %s|\n" + , i , "KFXO80" , atoi(devCfg.SerialNumber) , devCfg.ChannelCount + , std::string(26 - 6, ' ').c_str()); + stream->write_function(stream, "| * DSP: %s - PCI bus: %02d, PCI slot: %02d%s|\n" + , dspCfg.DspVersion , devCfg.PciBus , devCfg.PciSlot + , std::string(30 - strlen(dspCfg.DspVersion), ' ').c_str()); + stream->write_function(stream, "| * %-62s |\n" , dspCfg.FwVersion); + } + + } + + case kdtGSM: + case kdtGSMSpx: + { + K3L_GSM40_FW_CONFIG dspCfg; + + if (k3lGetDeviceConfig(i, ksoFirmware + kfiGSM40, &dspCfg, sizeof(dspCfg)) == ksSuccess) + { + stream->write_function(stream, "| [[ %02d ]] %s, serial '%04d', %02d channels. %s|\n" + , i , "KGSM" , atoi(devCfg.SerialNumber) , devCfg.ChannelCount + , std::string(26 - 4, ' ').c_str()); + + stream->write_function(stream, "| * DSP: %s - PCI bus: %02d, PCI slot: %02d%s|\n" + , dspCfg.DspVersion , devCfg.PciBus , devCfg.PciSlot + , std::string(30 - strlen(dspCfg.DspVersion), ' ').c_str()); + + stream->write_function(stream, "| * %-62s |\n" , dspCfg.FwVersion); + } + + break; + } + default: + stream->write_function(stream, "| [[ %02d ]] Unknown type '%02d'! Please contact Khomp support for help! |\n" + , i , k3l->device_type(i)); + break; + } + } + + stream->write_function(stream, " ------------------------------------------------------------------\n"); + + } else { + stream->write_function(stream, "USAGE: %s\n", KHOMP_SYNTAX); + } + +done: + switch_safe_free(myarg); + return status; + +} + /* For Emacs: * Local Variables: * mode:c

1 0

[commit] r13755 - freeswitch/trunk/src/mod/applications/mod_nibblebill
by FreeSWITCH SVN 11 Jun '09

11 Jun '09

Author: mikej Date: Thu Jun 11 10:59:08 2009 New Revision: 13755 Log: code before declaration (FSBUILD-172) Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c (original) +++ freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c Thu Jun 11 10:59:08 2009 @@ -386,6 +386,7 @@ switch_time_exp_t tm; const char *billrate; const char *billaccount; + float balance; if (!session) { /* Why are we here? */ @@ -421,8 +422,6 @@ if (profile->times->answered < 1) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Not billing %s - call is not in answered state\n", billaccount); - float balance; - /* See if this person has enough money left to continue the call */ balance = get_balance(billaccount); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Comparing %f to hangup balance of %f\n", balance, globals.nobal_amt); @@ -500,8 +499,6 @@ if (channel && switch_channel_get_state(channel) != CS_HANGUP) { switch_channel_set_private(channel, "_nibble_data_", nibble_data); - float balance; - /* See if this person has enough money left to continue the call */ balance = get_balance(billaccount); if (balance <= globals.nobal_amt) {

1 0

[commit] r13754 - freeswitch/trunk/src/mod/applications/mod_nibblebill
by FreeSWITCH SVN 11 Jun '09

11 Jun '09

Author: dschreiber Date: Wed Jun 10 22:42:01 2009 New Revision: 13754 Log: Fix a deadlock in last commit Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c (original) +++ freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c Wed Jun 10 22:42:01 2009 @@ -430,10 +430,6 @@ /* Not enough money - reroute call to nobal location */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Balance of %f fell below allowed amount of %f! (Account %s)\n", balance, globals.nobal_amt, billaccount); - /* IMPORTANT: Billing must be paused before the transfer occurs! This prevents infinite loops, since the transfer will result */ - /* in nibblebill checking the call again in the routing process for an allowed balance! */ - /* If you intend to give the user the option to re-up their balance, you must clear & resume billing once the balance is updated! */ - nibblebill_pause(session); transfer_call(session, globals.nobal_action); } @@ -503,22 +499,23 @@ /* Save this location, but only if the channel/session are not hungup (otherwise, we're done) */ if (channel && switch_channel_get_state(channel) != CS_HANGUP) { switch_channel_set_private(channel, "_nibble_data_", nibble_data); - } - float balance; + float balance; + + /* See if this person has enough money left to continue the call */ + balance = get_balance(billaccount); + if (balance <= globals.nobal_amt) { + /* Not enough money - reroute call to nobal location */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Balance of %f fell below allowed amount of %f! (Account %s)\n", balance, globals.nobal_amt, billaccount); + + /* IMPORTANT: Billing must be paused before the transfer occurs! This prevents infinite loops, since the transfer will result */ + /* in nibblebill checking the call again in the routing process for an allowed balance! */ + /* If you intend to give the user the option to re-up their balance, you must clear & resume billing once the balance is updated! */ + nibblebill_pause(session); + transfer_call(session, globals.nobal_action); + } + } - /* See if this person has enough money left to continue the call */ - balance = get_balance(billaccount); - if (balance <= globals.nobal_amt) { - /* Not enough money - reroute call to nobal location */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Balance of %f fell below allowed amount of %f! (Account %s)\n", balance, globals.nobal_amt, billaccount); - - /* IMPORTANT: Billing must be paused before the transfer occurs! This prevents infinite loops, since the transfer will result */ - /* in nibblebill checking the call again in the routing process for an allowed balance! */ - /* If you intend to give the user the option to re-up their balance, you must clear & resume billing once the balance is updated! */ - nibblebill_pause(session); - transfer_call(session, globals.nobal_action); - } /* Done changing - release lock */ if (globals.mutex) { @@ -840,7 +837,7 @@ /* on_routing */ process_hangup, /* Need to add a check here for anything in their account before routing */ /* on_execute */ sched_billing, /* Turn on heartbeat for this session and do an initial account check */ /* on_hangup */ process_hangup, /* On hangup - most important place to go bill */ - /* on_exch_media */ NULL, + /* on_exch_media */ sched_billing, /* on_soft_exec */ NULL, /* on_consume_med */ NULL, /* on_hibernate */ NULL,

1 0

[commit] r13753 - freeswitch/trunk/src/mod/applications/mod_nibblebill
by FreeSWITCH SVN 11 Jun '09

11 Jun '09

Author: dschreiber Date: Wed Jun 10 21:59:24 2009 New Revision: 13753 Log: Fixed nibblebill to bill on call start Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c (original) +++ freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c Wed Jun 10 21:59:24 2009 @@ -420,6 +420,23 @@ if (profile->times->answered < 1) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Not billing %s - call is not in answered state\n", billaccount); + + float balance; + + /* See if this person has enough money left to continue the call */ + balance = get_balance(billaccount); +switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Comparing %f to hangup balance of %f\n", balance, globals.nobal_amt); + if (balance <= globals.nobal_amt) { + /* Not enough money - reroute call to nobal location */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Balance of %f fell below allowed amount of %f! (Account %s)\n", balance, globals.nobal_amt, billaccount); + + /* IMPORTANT: Billing must be paused before the transfer occurs! This prevents infinite loops, since the transfer will result */ + /* in nibblebill checking the call again in the routing process for an allowed balance! */ + /* If you intend to give the user the option to re-up their balance, you must clear & resume billing once the balance is updated! */ + nibblebill_pause(session); + transfer_call(session, globals.nobal_action); + } + return SWITCH_STATUS_SUCCESS; } @@ -485,22 +502,22 @@ /* Save this location, but only if the channel/session are not hungup (otherwise, we're done) */ if (channel && switch_channel_get_state(channel) != CS_HANGUP) { - float balance; - switch_channel_set_private(channel, "_nibble_data_", nibble_data); + } - /* See if this person has enough money left to continue the call */ - balance = get_balance(billaccount); - if (balance < globals.nobal_amt) { - /* Not enough money - reroute call to nobal location */ + float balance; + + /* See if this person has enough money left to continue the call */ + balance = get_balance(billaccount); + if (balance <= globals.nobal_amt) { + /* Not enough money - reroute call to nobal location */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Balance of %f fell below allowed amount of %f! (Account %s)\n", balance, globals.nobal_amt, billaccount); - /* IMPORTANT: Billing must be paused before the transfer occurs! This prevents infinite loops, since the transfer will result */ - /* in nibblebill checking the call again in the routing process for an allowed balance! */ - /* If you intend to give the user the option to re-up their balance, you must clear & resume billing once the balance is updated! */ - nibblebill_pause(session); - transfer_call(session, globals.nobal_action); - } + /* IMPORTANT: Billing must be paused before the transfer occurs! This prevents infinite loops, since the transfer will result */ + /* in nibblebill checking the call again in the routing process for an allowed balance! */ + /* If you intend to give the user the option to re-up their balance, you must clear & resume billing once the balance is updated! */ + nibblebill_pause(session); + transfer_call(session, globals.nobal_action); } /* Done changing - release lock */ @@ -820,7 +837,7 @@ switch_state_handler_table_t nibble_state_handler = { /* on_init */ NULL, - /* on_routing */ NULL, /* Need to add a check here for anything in their account before routing */ + /* on_routing */ process_hangup, /* Need to add a check here for anything in their account before routing */ /* on_execute */ sched_billing, /* Turn on heartbeat for this session and do an initial account check */ /* on_hangup */ process_hangup, /* On hangup - most important place to go bill */ /* on_exch_media */ NULL,

1 0

[commit] r13752 - freeswitch/trunk
by FreeSWITCH SVN 10 Jun '09

10 Jun '09

Author: mikej Date: Wed Jun 10 16:45:27 2009 New Revision: 13752 Log: remove gnu grepisms breaking test on solaris Modified: freeswitch/trunk/bootstrap.sh Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Wed Jun 10 16:45:27 2009 @@ -289,7 +289,8 @@ LTTEST=`grep "AC_PROG_LIBTOOL" ${CFFILE}` LTTEST2=`grep "AM_PROG_LIBTOOL" ${CFFILE}` - AMTEST=`grep "AM_INIT_AUTOMAKE\|AC_PROG_INSTALL" ${CFFILE}` + AMTEST=`grep "AM_INIT_AUTOMAKE" ${CFFILE}` + AMTEST2=`grep "AC_PROG_INSTALL" ${CFFILE}` AHTEST=`grep "AC_CONFIG_HEADERS" ${CFFILE}` echo "Creating aclocal.m4" @@ -315,7 +316,7 @@ fi #run if AM_INIT_AUTOMAKE / AC_PROG_INSTALL is in configure.in/configure.ac - if [ ! -z "${AMTEST}" ]; then + if [ ! -z "${AMTEST}" -o "${AMTEST2}" ] ; then echo "Creating Makefile.in" ${AUTOMAKE:-automake} --no-force --add-missing --copy ; fi

1 0

[commit] r13751 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 10 Jun '09

10 Jun '09

Author: andrew Date: Wed Jun 10 16:17:42 2009 New Revision: 13751 Log: Use SWITCH_XML_SECTION_MAX Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Wed Jun 10 16:17:42 2009 @@ -110,7 +110,7 @@ switch_mutex_lock(globals.listener_mutex); - switch_xml_set_binding_sections(bindings.search_binding, (1 << sizeof(switch_xml_section_enum_t))); + switch_xml_set_binding_sections(bindings.search_binding, SWITCH_XML_SECTION_MAX); for (ptr = bindings.head; ptr; lst = ptr, ptr = ptr->next) { if ((listener && ptr->listener == listener) || @@ -1400,7 +1400,7 @@ memset(&bindings, 0, sizeof(bindings)); - if (switch_xml_bind_search_function_ret(erlang_fetch, (1 << sizeof(switch_xml_section_enum_t)), NULL, &bindings.search_binding) != SWITCH_STATUS_SUCCESS) { + if (switch_xml_bind_search_function_ret(erlang_fetch, SWITCH_XML_SECTION_MAX, NULL, &bindings.search_binding) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); close_socket(&listen_list.sockfd); return SWITCH_STATUS_GENERR;

1 0

[commit] r13750 - freeswitch/trunk/src
by FreeSWITCH SVN 10 Jun '09

10 Jun '09

Author: mikej Date: Wed Jun 10 13:02:08 2009 New Revision: 13750 Log: bounds checking (FSCORE-380) Modified: freeswitch/trunk/src/switch_core_asr.c freeswitch/trunk/src/switch_core_speech.c Modified: freeswitch/trunk/src/switch_core_asr.c ============================================================================== --- freeswitch/trunk/src/switch_core_asr.c (original) +++ freeswitch/trunk/src/switch_core_asr.c Wed Jun 10 13:02:08 2009 @@ -126,8 +126,8 @@ if (!switch_strlen_zero(param_string)) { char *param[256] = { 0 }; int i; - switch_separate_string(param_string, ',', param, (sizeof(param) / sizeof(param[0]))); - for (i = 0; param[i]; ++i) { + int argc = switch_separate_string(param_string, ',', param, (sizeof(param) / sizeof(param[0]))); + for (i = 0; i < argc && param[i]; ++i) { char *param_pair[2] = { 0 }; if(switch_separate_string(param[i], '=', param_pair, (sizeof(param_pair) / sizeof(param_pair[0]))) == 2) { switch_core_asr_text_param(ah, param_pair[0], param_pair[1]); Modified: freeswitch/trunk/src/switch_core_speech.c ============================================================================== --- freeswitch/trunk/src/switch_core_speech.c (original) +++ freeswitch/trunk/src/switch_core_speech.c Wed Jun 10 13:02:08 2009 @@ -137,8 +137,8 @@ if (!switch_strlen_zero(param_string)) { char *param[256] = { 0 }; int i; - switch_separate_string(param_string, ',', param, (sizeof(param) / sizeof(param[0]))); - for (i = 0; param[i]; ++i) { + int argc = switch_separate_string(param_string, ',', param, (sizeof(param) / sizeof(param[0]))); + for (i = 0; i < argc && param[i]; ++i) { char *param_pair[2] = { 0 }; if(switch_separate_string(param[i], '=', param_pair, (sizeof(param_pair) / sizeof(param_pair[0]))) == 2) { switch_core_speech_text_param_tts(sh, param_pair[0], param_pair[1]);

1 0

[commit] r13749 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sresolv
by FreeSWITCH SVN 10 Jun '09

10 Jun '09

Author: mikej Date: Wed Jun 10 10:24:34 2009 New Revision: 13749 Log: libsofia: handle mid-line comments in resolv.conf patch from Lee Verberne (SFSIP-152) Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Jun 10 10:24:34 2009 @@ -1 +1 @@ -Thu Jun 4 16:10:50 CDT 2009 +Wed Jun 10 11:14:52 EDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Wed Jun 10 10:24:34 2009 @@ -2270,11 +2270,11 @@ /* Skip whitespace at the beginning ...*/ b = buf + strspn(buf, " \t"); - /* ... and at the end of line */ - for (len = strlen(b); len > 0 && strchr(" \t\r\n", b[len - 1]); len--) + /* ... and comments + whitespace at the end */ + for (len = strcspn(b, "#;"); len > 0 && strchr(" \t\r\n", b[len - 1]); len--) ; - if (len == 0 || b[0] == '#') /* Empty line or comment */ + if (len == 0) /* Empty line or comment */ continue; b[len] = '\0';

1 0