p->prev->next = p->next;
if (p->next)
p->next->prev = p->prev;
+ if (p->sig_pvt) {
+ if (analog_lib_handles(p->sig, 0, 0)) {
+ analog_delete(p->sig_pvt);
+ }
+#if defined(HAVE_PRI)
+ if (dahdi_sig_pri_lib_handles(p->sig)) {
+ sig_pri_chan_delete(p->sig_pvt);
+ }
+#endif /* defined(HAVE_PRI) */
+ }
if (p->use_smdi)
ast_smdi_interface_unref(p->smdi_iface);
if (p->mwi_event_sub)
} else {
chan_sig = 0;
}
+ tmp->sig = chan_sig;
if (analog_lib_handles(chan_sig, tmp->radio, tmp->oprmode)) {
analog_p = analog_new(dahdisig_to_analogsig(chan_sig), &dahdi_analog_callbacks, tmp);
tmp->mwimonitor_neon = conf->chan.mwimonitor_neon;
tmp->mwimonitor_rpas = conf->chan.mwimonitor_rpas;
}
- tmp->sig = chan_sig;
tmp->outsigmod = conf->chan.outsigmod;
tmp->ringt_base = ringt_base;
tmp->firstradio = 0;
}
-struct analog_pvt * analog_new(enum analog_sigtype signallingtype, struct analog_callback *c, void *private_data)
+struct analog_pvt *analog_new(enum analog_sigtype signallingtype, struct analog_callback *c, void *private_data)
{
struct analog_pvt *p;
p = ast_calloc(1, sizeof(*p));
-
if (!p) {
return p;
}
return p;
}
+/*!
+ * \brief Delete the analog private structure.
+ * \since 1.6.3
+ *
+ * \param doomed Analog private structure to delete.
+ *
+ * \return Nothing
+ */
+void analog_delete(struct analog_pvt *doomed)
+{
+ ast_free(doomed);
+}
+
int analog_config_complete(struct analog_pvt *p)
{
/* No call waiting on non FXS channels */
int ringt_base;
};
-struct analog_pvt * analog_new(enum analog_sigtype signallingtype, struct analog_callback *c, void *private_data);
+struct analog_pvt *analog_new(enum analog_sigtype signallingtype, struct analog_callback *c, void *private_data);
+void analog_delete(struct analog_pvt *doomed);
void analog_free(struct analog_pvt *p);
return p;
}
+/*!
+ * \brief Delete the sig_pri private channel structure.
+ * \since 1.6.3
+ *
+ * \param doomed sig_pri private channel structure to delete.
+ *
+ * \return Nothing
+ */
+void sig_pri_chan_delete(struct sig_pri_chan *doomed)
+{
+ ast_free(doomed);
+}
+
static void build_status(char *s, size_t len, int status, int active)
{
if (!s || len < 1) {
struct ast_channel *sig_pri_request(struct sig_pri_chan *p, enum sig_pri_law law, const struct ast_channel *requestor);
struct sig_pri_chan *sig_pri_chan_new(void *pvt_data, struct sig_pri_callback *callback, struct sig_pri_pri *pri, int logicalspan, int channo, int trunkgroup);
+void sig_pri_chan_delete(struct sig_pri_chan *doomed);
int pri_is_up(struct sig_pri_pri *pri);