[asterisk-commits] jpeeler: branch jpeeler/asterisk-sigwork-trunk r200691 - /team/jpeeler/asteri...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Jun 15 16:04:46 CDT 2009
Author: jpeeler
Date: Mon Jun 15 16:04:42 2009
New Revision: 200691
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=200691
Log:
start getting rid of old code and some random commenting cleanup
Modified:
team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c
team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.c
team/jpeeler/asterisk-sigwork-trunk/channels/sig_pri.h
Modified: team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c?view=diff&rev=200691&r1=200690&r2=200691
==============================================================================
--- team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c (original)
+++ team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c Mon Jun 15 16:04:42 2009
@@ -1126,7 +1126,6 @@
struct timeval flashtime; /*!< Last flash-hook time */
/*! \brief Opaque DSP configuration structure. */
struct ast_dsp *dsp;
- //int cref; /*!< Call reference number (Not used) */
/*! \brief DAHDI dial operation command struct for ioctl() call. */
struct dahdi_dialoperation dop;
int whichwink; /*!< SIG_FEATDMF_TA Which wink are we on? */
@@ -9867,8 +9866,6 @@
*span = -1;
return 0;
}
- /* jpeeler */
- //pris[*span].offset = offset;
pris[*span].pri.span = *span + 1;
}
}
@@ -9929,7 +9926,6 @@
}
if (!y) {
pris[span].pri.trunkgroup = trunkgroup;
- //pris[span].offset = channels[y] - p.chanpos;
ospan = span;
}
pris[ospan].dchannels[y] = channels[y];
@@ -10407,13 +10403,11 @@
ast_copy_string(pris[span].pri.unknownprefix, conf->pri.pri.unknownprefix, sizeof(pris[span].pri.unknownprefix));
pris[span].pri.resetinterval = conf->pri.pri.resetinterval;
- //tmp->pri = &pris[span];
if (si.spanno != span + 1) { /* in another trunkgroup */
tmp->prioffset = pris[span].pri.numchans;
} else {
tmp->prioffset = p.chanpos;
}
- //tmp->call = NULL;
} else {
ast_log(LOG_ERROR, "Channel %d is reserved for D-channel.\n", p.chanpos);
destroy_dahdi_pvt(&tmp);
@@ -11805,7 +11799,7 @@
ast_mutex_lock(&p->lock);
p->remotelyblocked = 1;
p->inservice = 0;
- ast_mutex_unlock(&p->lock); //doesn't require a SS7 acknowledgement
+ ast_mutex_unlock(&p->lock); /* doesn't require a SS7 acknowledgement */
break;
case ISUP_EVENT_BLO:
chanpos = ss7_find_cic(linkset, e->blo.cic, e->blo.opc);
@@ -12281,7 +12275,7 @@
ast_cli(a->fd, "Enabled debugging on span %d\n", span);
} else if (level == 0) {
pri_set_debug(pris[span-1].pri.dchans[x], 0);
- //close the file if it's set
+ /* close the file if it's set */
ast_mutex_lock(&pridebugfdlock);
close(pridebugfd);
pridebugfd = -1;
Modified: team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.c?view=diff&rev=200691&r1=200690&r2=200691
==============================================================================
--- team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.c (original)
+++ team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.c Mon Jun 15 16:04:42 2009
@@ -774,11 +774,10 @@
p->lastcid_name[0] = '\0';
if (p->use_callerid) {
- //p->callwaitcas = 0;
+ p->callwaitcas = 0;
p->cid.cid_name = p->lastcid_name;
p->cid.cid_num = p->lastcid_num;
}
-
ast_setstate(ast, AST_STATE_RINGING);
index = analog_get_index(ast, p, 0);
Modified: team/jpeeler/asterisk-sigwork-trunk/channels/sig_pri.h
URL: http://svn.asterisk.org/svn-view/asterisk/team/jpeeler/asterisk-sigwork-trunk/channels/sig_pri.h?view=diff&rev=200691&r1=200690&r2=200691
==============================================================================
--- team/jpeeler/asterisk-sigwork-trunk/channels/sig_pri.h (original)
+++ team/jpeeler/asterisk-sigwork-trunk/channels/sig_pri.h Mon Jun 15 16:04:42 2009
@@ -167,37 +167,37 @@
struct sig_pri_pri {
/* Should be set by user */
int pritimers[PRI_MAX_TIMERS];
- int overlapdial; /*!< In overlap dialing mode */
- int qsigchannelmapping; /*!< QSIG channel mapping type */
+ int overlapdial; /*!< In overlap dialing mode */
+ int qsigchannelmapping; /*!< QSIG channel mapping type */
int discardremoteholdretrieval; /*!< shall remote hold or remote retrieval notifications be discarded? */
- int facilityenable; /*!< Enable facility IEs */
- int dchan_logical_span[NUM_DCHANS]; /*!< Logical offset the DCHAN sits in */
- int fds[NUM_DCHANS]; /*!< FD's for d-channels */
+ int facilityenable; /*!< Enable facility IEs */
+ int dchan_logical_span[NUM_DCHANS]; /*!< Logical offset the DCHAN sits in */
+ int fds[NUM_DCHANS]; /*!< FD's for d-channels */
#ifdef HAVE_PRI_SERVICE_MESSAGES
- unsigned int enable_service_message_support:1; /*!< enable SERVICE message support */
+ unsigned int enable_service_message_support:1; /*!< enable SERVICE message support */
#endif
#ifdef HAVE_PRI_INBANDDISCONNECT
- unsigned int inbanddisconnect:1; /*!< Should we support inband audio after receiving DISCONNECT? */
+ unsigned int inbanddisconnect:1; /*!< Should we support inband audio after receiving DISCONNECT? */
#endif
int dialplan; /*!< Dialing plan */
int localdialplan; /*!< Local dialing plan */
- char internationalprefix[10]; /*!< country access code ('00' for european dialplans) */
- char nationalprefix[10]; /*!< area access code ('0' for european dialplans) */
- char localprefix[20]; /*!< area access code + area code ('0'+area code for european dialplans) */
- char privateprefix[20]; /*!< for private dialplans */
- char unknownprefix[20]; /*!< for unknown dialplans */
+ char internationalprefix[10]; /*!< country access code ('00' for european dialplans) */
+ char nationalprefix[10]; /*!< area access code ('0' for european dialplans) */
+ char localprefix[20]; /*!< area access code + area code ('0'+area code for european dialplans) */
+ char privateprefix[20]; /*!< for private dialplans */
+ char unknownprefix[20]; /*!< for unknown dialplans */
long resetinterval; /*!< Interval (in seconds) for resetting unused channels */
- char idleext[AST_MAX_EXTENSION]; /*!< Where to idle extra calls */
- char idlecontext[AST_MAX_CONTEXT]; /*!< What context to use for idle */
- char idledial[AST_MAX_EXTENSION]; /*!< What to dial before dumping */
+ char idleext[AST_MAX_EXTENSION]; /*!< Where to idle extra calls */
+ char idlecontext[AST_MAX_CONTEXT]; /*!< What context to use for idle */
+ char idledial[AST_MAX_EXTENSION]; /*!< What to dial before dumping */
int minunused; /*!< Min # of channels to keep empty */
int minidle; /*!< Min # of "idling" calls to keep active */
int nodetype; /*!< Node type */
int switchtype; /*!< Type of switch to emulate */
- int nsf; /*!< Network-Specific Facilities */
+ int nsf; /*!< Network-Specific Facilities */
int trunkgroup; /*!< What our trunkgroup is */
- int dchanavail[NUM_DCHANS]; /*!< Whether each channel is available */
+ int dchanavail[NUM_DCHANS]; /*!< Whether each channel is available */
int debug; /*!< set to true if to dump PRI event info (tested but never set) */
int span; /*!< span number put into user output messages */
int resetting; /*!< true if span is being reset/restarted */
@@ -205,13 +205,13 @@
int sig; /*!< ISDN signalling type (SIG_PRI, SIG_BRI, SIG_BRI_PTMP, etc...) */
/* Everything after here is internally set */
- struct pri *dchans[NUM_DCHANS]; /*!< Actual d-channels */
- struct pri *pri; /*!< Currently active D-channel */
- int numchans; /*!< Num of channels we represent */
- struct sig_pri_chan *pvts[MAX_CHANNELS]; /*!< Member channel pvt structs */
- pthread_t master; /*!< Thread of master */
- ast_mutex_t lock; /*!< Mutex */
- time_t lastreset; /*!< time when unused channels were last reset */
+ struct pri *dchans[NUM_DCHANS]; /*!< Actual d-channels */
+ struct pri *pri; /*!< Currently active D-channel */
+ int numchans; /*!< Num of channels we represent */
+ struct sig_pri_chan *pvts[MAX_CHANNELS]; /*!< Member channel pvt structs */
+ pthread_t master; /*!< Thread of master */
+ ast_mutex_t lock; /*!< Mutex */
+ time_t lastreset; /*!< time when unused channels were last reset */
struct sig_pri_callback *calls;
};
More information about the asterisk-commits
mailing list