diff options
-rw-r--r-- | channels/chan_pjsip.c | 2 | ||||
-rw-r--r-- | formats/format_g719.c | 17 | ||||
-rw-r--r-- | formats/format_g723.c | 15 | ||||
-rw-r--r-- | formats/format_g726.c | 15 | ||||
-rw-r--r-- | formats/format_g729.c | 16 | ||||
-rw-r--r-- | formats/format_gsm.c | 15 | ||||
-rw-r--r-- | formats/format_h263.c | 15 | ||||
-rw-r--r-- | formats/format_h264.c | 15 | ||||
-rw-r--r-- | formats/format_ilbc.c | 16 | ||||
-rw-r--r-- | formats/format_pcm.c | 20 | ||||
-rw-r--r-- | formats/format_siren14.c | 17 | ||||
-rw-r--r-- | formats/format_siren7.c | 17 | ||||
-rw-r--r-- | formats/format_sln.c | 19 | ||||
-rw-r--r-- | formats/format_vox.c | 17 | ||||
-rw-r--r-- | formats/format_wav.c | 17 | ||||
-rw-r--r-- | formats/format_wav_gsm.c | 17 | ||||
-rw-r--r-- | res/res_calendar.c | 4 | ||||
-rw-r--r-- | res/res_calendar_caldav.c | 4 | ||||
-rw-r--r-- | res/res_calendar_ews.c | 4 | ||||
-rw-r--r-- | res/res_calendar_exchange.c | 4 | ||||
-rw-r--r-- | res/res_calendar_icalendar.c | 4 | ||||
-rw-r--r-- | res/res_pjsip_t38.c | 4 | ||||
-rw-r--r-- | res/res_smdi.c | 4 |
23 files changed, 103 insertions, 175 deletions
diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c index 677dfd3dd..841654c92 100644 --- a/channels/chan_pjsip.c +++ b/channels/chan_pjsip.c @@ -941,6 +941,8 @@ static int chan_pjsip_write_stream(struct ast_channel *ast, int stream_num, stru res = media->write_callback(session, media, frame); } break; + case AST_FRAME_CNG: + break; default: ast_log(LOG_WARNING, "Can't send %u type frames with PJSIP\n", frame->frametype); break; diff --git a/formats/format_g719.c b/formats/format_g719.c index 3b2195a30..e6ecd794f 100644 --- a/formats/format_g719.c +++ b/formats/format_g719.c @@ -40,20 +40,15 @@ static struct ast_frame *g719read(struct ast_filestream *s, int *whennext) { - int res; - /* Send a frame from the file to the appropriate channel */ + size_t res; + /* Send a frame from the file to the appropriate channel */ AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, BUF_SIZE); if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) { - if (feof(s->f)) { - if (res) { - ast_debug(3, "Incomplete frame data at end of %s file " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); - } - } else { - ast_log(LOG_ERROR, "Error while reading %s file: %s\n", - ast_format_get_name(s->fr.subclass.format), strerror(errno)); + if (res) { + ast_log(LOG_WARNING, "Short read of %s data (expected %d bytes, read %zu): %s\n", + ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res, + strerror(errno)); } return NULL; } diff --git a/formats/format_g723.c b/formats/format_g723.c index fff6ed07b..a88d132d9 100644 --- a/formats/format_g723.c +++ b/formats/format_g723.c @@ -40,7 +40,7 @@ static struct ast_frame *g723_read(struct ast_filestream *s, int *whennext) { unsigned short size; - int res; + size_t res; int delay; /* Read the delay for the next packet, and schedule again if necessary */ /* XXX is this ignored ? */ @@ -65,15 +65,10 @@ static struct ast_frame *g723_read(struct ast_filestream *s, int *whennext) /* Read the data into the buffer */ AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, size); if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) { - if (feof(s->f)) { - if (res) { - ast_debug(3, "Incomplete frame data at end of %s file " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); - } - } else { - ast_log(LOG_ERROR, "Error while reading %s file: %s\n", - ast_format_get_name(s->fr.subclass.format), strerror(errno)); + if (res) { + ast_log(LOG_WARNING, "Short read of %s data (expected %d bytes, read %zu): %s\n", + ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res, + strerror(errno)); } return NULL; } diff --git a/formats/format_g726.c b/formats/format_g726.c index 33f963953..366f85d8d 100644 --- a/formats/format_g726.c +++ b/formats/format_g726.c @@ -117,22 +117,17 @@ static int g726_16_rewrite(struct ast_filestream *s, const char *comment) static struct ast_frame *g726_read(struct ast_filestream *s, int *whennext) { - int res; + size_t res; struct g726_desc *fs = (struct g726_desc *)s->_private; /* Send a frame from the file to the appropriate channel */ AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, frame_size[fs->rate]); s->fr.samples = 8 * FRAME_TIME; if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) { - if (feof(s->f)) { - if (res) { - ast_debug(3, "Incomplete frame data at end of %s file " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); - } - } else { - ast_log(LOG_ERROR, "Error while reading %s file: %s\n", - ast_format_get_name(s->fr.subclass.format), strerror(errno)); + if (res) { + ast_log(LOG_WARNING, "Short read of %s data (expected %d bytes, read %zu): %s\n", + ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res, + strerror(errno)); } return NULL; } diff --git a/formats/format_g729.c b/formats/format_g729.c index 91dc855f1..324371c33 100644 --- a/formats/format_g729.c +++ b/formats/format_g729.c @@ -46,20 +46,16 @@ static struct ast_frame *g729_read(struct ast_filestream *s, int *whennext) { - int res; + size_t res; + /* Send a frame from the file to the appropriate channel */ s->fr.samples = G729A_SAMPLES; AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, BUF_SIZE); if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) { - if (feof(s->f)) { - if (res) { - ast_debug(3, "Incomplete frame data at end of %s file " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); - } - } else { - ast_log(LOG_ERROR, "Error while reading %s file: %s\n", - ast_format_get_name(s->fr.subclass.format), strerror(errno)); + if (res && res != 10) /* XXX what for ? */ { + ast_log(LOG_WARNING, "Short read of %s data (expected %d bytes, read %zu): %s\n", + ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res, + strerror(errno)); } return NULL; } diff --git a/formats/format_gsm.c b/formats/format_gsm.c index b737c97e5..70600b47f 100644 --- a/formats/format_gsm.c +++ b/formats/format_gsm.c @@ -53,19 +53,14 @@ static const char gsm_silence[] = /* 33 */ static struct ast_frame *gsm_read(struct ast_filestream *s, int *whennext) { - int res; + size_t res; AST_FRAME_SET_BUFFER(&(s->fr), s->buf, AST_FRIENDLY_OFFSET, GSM_FRAME_SIZE); if ((res = fread(s->fr.data.ptr, 1, GSM_FRAME_SIZE, s->f)) != GSM_FRAME_SIZE) { - if (feof(s->f)) { - if (res) { - ast_debug(3, "Incomplete frame data at end of %s file " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), GSM_FRAME_SIZE, res); - } - } else { - ast_log(LOG_ERROR, "Error while reading %s file: %s\n", - ast_format_get_name(s->fr.subclass.format), strerror(errno)); + if (res) { + ast_log(LOG_WARNING, "Short read of %s data (expected %d bytes, read %zu): %s\n", + ast_format_get_name(s->fr.subclass.format), GSM_FRAME_SIZE, res, + strerror(errno)); } return NULL; } diff --git a/formats/format_h263.c b/formats/format_h263.c index 586e2d8e5..97bca21f0 100644 --- a/formats/format_h263.c +++ b/formats/format_h263.c @@ -67,7 +67,7 @@ static int h263_open(struct ast_filestream *s) static struct ast_frame *h263_read(struct ast_filestream *s, int *whennext) { - int res; + size_t res; uint32_t mark; unsigned short len; unsigned int ts; @@ -85,15 +85,10 @@ static struct ast_frame *h263_read(struct ast_filestream *s, int *whennext) } AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, len); if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) { - if (feof(s->f)) { - if (res) { - ast_debug(3, "Incomplete frame data at end of %s file " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); - } - } else { - ast_log(LOG_ERROR, "Error while reading %s file: %s\n", - ast_format_get_name(s->fr.subclass.format), strerror(errno)); + if (res) { + ast_log(LOG_WARNING, "Short read of %s data (expected %d bytes, read %zu): %s\n", + ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res, + strerror(errno)); } return NULL; } diff --git a/formats/format_h264.c b/formats/format_h264.c index 9230129e7..8860d8831 100644 --- a/formats/format_h264.c +++ b/formats/format_h264.c @@ -59,7 +59,7 @@ static int h264_open(struct ast_filestream *s) static struct ast_frame *h264_read(struct ast_filestream *s, int *whennext) { - int res; + size_t res; int mark = 0; unsigned short len; unsigned int ts; @@ -77,15 +77,10 @@ static struct ast_frame *h264_read(struct ast_filestream *s, int *whennext) } AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, len); if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) { - if (feof(s->f)) { - if (res) { - ast_debug(3, "Incomplete frame data at end of %s file " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); - } - } else { - ast_log(LOG_ERROR, "Error while reading %s file: %s\n", - ast_format_get_name(s->fr.subclass.format), strerror(errno)); + if (res) { + ast_log(LOG_WARNING, "Short read of %s data (expected %d bytes, read %zu): %s\n", + ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res, + strerror(errno)); } return NULL; } diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c index 8b41ab228..326a04ebd 100644 --- a/formats/format_ilbc.c +++ b/formats/format_ilbc.c @@ -45,19 +45,15 @@ static struct ast_frame *ilbc_read(struct ast_filestream *s, int *whennext) { - int res; + size_t res; + /* Send a frame from the file to the appropriate channel */ AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, ILBC_BUF_SIZE); if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) { - if (feof(s->f)) { - if (res) { - ast_debug(3, "Incomplete frame data at end of %s file " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); - } - } else { - ast_log(LOG_ERROR, "Error while reading %s file: %s\n", - ast_format_get_name(s->fr.subclass.format), strerror(errno)); + if (res) { + ast_log(LOG_WARNING, "Short read of %s data (expected %d bytes, read %zu): %s\n", + ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res, + strerror(errno)); } return NULL; } diff --git a/formats/format_pcm.c b/formats/format_pcm.c index 4891f7ed5..b4fd3b36a 100644 --- a/formats/format_pcm.c +++ b/formats/format_pcm.c @@ -78,21 +78,15 @@ static int pcma_rewrite(struct ast_filestream *s, const char *comment) static struct ast_frame *pcm_read(struct ast_filestream *s, int *whennext) { - int res; - - /* Send a frame from the file to the appropriate channel */ + size_t res; + /* Send a frame from the file to the appropriate channel */ AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, BUF_SIZE); - if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) { - if (feof(s->f)) { - if (res) { - ast_debug(3, "Incomplete frame data at end of %s file " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); - } - } else { - ast_log(LOG_ERROR, "Error while reading %s file: %s\n", - ast_format_get_name(s->fr.subclass.format), strerror(errno)); + if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) < 1) { + if (res) { + ast_log(LOG_WARNING, "Short read of %s data (expected %d bytes, read %zu): %s\n", + ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res, + strerror(errno)); } return NULL; } diff --git a/formats/format_siren14.c b/formats/format_siren14.c index e15e20f46..d39096a21 100644 --- a/formats/format_siren14.c +++ b/formats/format_siren14.c @@ -40,20 +40,15 @@ static struct ast_frame *siren14read(struct ast_filestream *s, int *whennext) { - int res; - /* Send a frame from the file to the appropriate channel */ + size_t res; + /* Send a frame from the file to the appropriate channel */ AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, BUF_SIZE); if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) { - if (feof(s->f)) { - if (res) { - ast_debug(3, "Incomplete frame data at end of %s file " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); - } - } else { - ast_log(LOG_ERROR, "Error while reading %s file: %s\n", - ast_format_get_name(s->fr.subclass.format), strerror(errno)); + if (res) { + ast_log(LOG_WARNING, "Short read of %s data (expected %d bytes, read %zu): %s\n", + ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res, + strerror(errno)); } return NULL; } diff --git a/formats/format_siren7.c b/formats/format_siren7.c index 298992c3c..839675072 100644 --- a/formats/format_siren7.c +++ b/formats/format_siren7.c @@ -40,20 +40,15 @@ static struct ast_frame *siren7read(struct ast_filestream *s, int *whennext) { - int res; - /* Send a frame from the file to the appropriate channel */ + size_t res; + /* Send a frame from the file to the appropriate channel */ AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, BUF_SIZE); if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) { - if (feof(s->f)) { - if (res) { - ast_debug(3, "Incomplete frame data at end of %s file " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); - } - } else { - ast_log(LOG_ERROR, "Error while reading %s file: %s\n", - ast_format_get_name(s->fr.subclass.format), strerror(errno)); + if (res) { + ast_log(LOG_WARNING, "Short read of %s data (expected %d bytes, read %zu): %s\n", + ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res, + strerror(errno)); } return NULL; } diff --git a/formats/format_sln.c b/formats/format_sln.c index 5a5cde777..20985ef90 100644 --- a/formats/format_sln.c +++ b/formats/format_sln.c @@ -34,20 +34,15 @@ static struct ast_frame *generic_read(struct ast_filestream *s, int *whennext, unsigned int buf_size) { - int res; - /* Send a frame from the file to the appropriate channel */ + size_t res; + /* Send a frame from the file to the appropriate channel */ AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, buf_size); - if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) { - if (feof(s->f)) { - if (res) { - ast_debug(3, "Incomplete frame data at end of %s file " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); - } - } else { - ast_log(LOG_ERROR, "Error while reading %s file: %s\n", - ast_format_get_name(s->fr.subclass.format), strerror(errno)); + if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) < 1) { + if (res) { + ast_log(LOG_WARNING, "Short read of %s data (expected %d bytes, read %zu): %s\n", + ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res, + strerror(errno)); } return NULL; } diff --git a/formats/format_vox.c b/formats/format_vox.c index c3da4ab94..82379f641 100644 --- a/formats/format_vox.c +++ b/formats/format_vox.c @@ -40,20 +40,15 @@ static struct ast_frame *vox_read(struct ast_filestream *s, int *whennext) { - int res; + size_t res; /* Send a frame from the file to the appropriate channel */ AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, BUF_SIZE); - if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) { - if (feof(s->f)) { - if (res) { - ast_debug(3, "Incomplete frame data at end of %s file " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); - } - } else { - ast_log(LOG_ERROR, "Error while reading %s file: %s\n", - ast_format_get_name(s->fr.subclass.format), strerror(errno)); + if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) < 1) { + if (res) { + ast_log(LOG_WARNING, "Short read of %s data (expected %d bytes, read %zu): %s\n", + ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res, + strerror(errno)); } return NULL; } diff --git a/formats/format_wav.c b/formats/format_wav.c index ce8a8bf0a..b4e1f34f2 100644 --- a/formats/format_wav.c +++ b/formats/format_wav.c @@ -369,7 +369,7 @@ static void wav_close(struct ast_filestream *s) static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext) { - int res; + size_t res; int samples; /* actual samples read */ #if __BYTE_ORDER == __BIG_ENDIAN int x; @@ -391,16 +391,11 @@ static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext) /* ast_debug(1, "here: %d, maxlen: %d, bytes: %d\n", here, s->maxlen, bytes); */ AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, bytes); - if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) { - if (feof(s->f)) { - if (res) { - ast_debug(3, "Incomplete frame data at end of %s file " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); - } - } else { - ast_log(LOG_ERROR, "Error while reading %s file: %s\n", - ast_format_get_name(s->fr.subclass.format), strerror(errno)); + if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) == 0) { + if (res) { + ast_log(LOG_WARNING, "Short read of %s data (expected %d bytes, read %zu): %s\n", + ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res, + strerror(errno)); } return NULL; } diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c index 8d7d87f65..cd1cc6a2a 100644 --- a/formats/format_wav_gsm.c +++ b/formats/format_wav_gsm.c @@ -419,18 +419,13 @@ static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext) } else { /* read and convert */ unsigned char msdata[MSGSM_FRAME_SIZE]; - int res; - + size_t res; + if ((res = fread(msdata, 1, MSGSM_FRAME_SIZE, s->f)) != MSGSM_FRAME_SIZE) { - if (feof(s->f)) { - if (res) { - ast_debug(3, "Incomplete frame data at end of %s file " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), MSGSM_FRAME_SIZE, res); - } - } else { - ast_log(LOG_ERROR, "Error while reading %s file: %s\n", - ast_format_get_name(s->fr.subclass.format), strerror(errno)); + if (res && res != 1) { + ast_log(LOG_WARNING, "Short read of %s data (expected %d bytes, read %zu): %s\n", + ast_format_get_name(s->fr.subclass.format), MSGSM_FRAME_SIZE, res, + strerror(errno)); } return NULL; } diff --git a/res/res_calendar.c b/res/res_calendar.c index 9ce8159c7..e4c89dfd7 100644 --- a/res/res_calendar.c +++ b/res/res_calendar.c @@ -33,7 +33,7 @@ */ /*** MODULEINFO - <support_level>core</support_level> + <support_level>extended</support_level> ***/ #include "asterisk.h" @@ -1923,7 +1923,7 @@ static int load_module(void) return AST_MODULE_LOAD_SUCCESS; } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Asterisk Calendar integration", - .support_level = AST_MODULE_SUPPORT_CORE, + .support_level = AST_MODULE_SUPPORT_EXTENDED, .load = load_module, .unload = unload_module, .reload = reload, diff --git a/res/res_calendar_caldav.c b/res/res_calendar_caldav.c index 8a603cf47..3c1c74a4c 100644 --- a/res/res_calendar_caldav.c +++ b/res/res_calendar_caldav.c @@ -24,7 +24,7 @@ <depend>neon</depend> <depend>ical</depend> <depend>libxml2</depend> - <support_level>core</support_level> + <support_level>extended</support_level> ***/ #include "asterisk.h" @@ -723,7 +723,7 @@ static int unload_module(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk CalDAV Calendar Integration", - .support_level = AST_MODULE_SUPPORT_CORE, + .support_level = AST_MODULE_SUPPORT_EXTENDED, .load = load_module, .unload = unload_module, .load_pri = AST_MODPRI_DEVSTATE_PLUGIN, diff --git a/res/res_calendar_ews.c b/res/res_calendar_ews.c index 998188dcf..cf0ddc240 100644 --- a/res/res_calendar_ews.c +++ b/res/res_calendar_ews.c @@ -22,7 +22,7 @@ /*** MODULEINFO <depend>neon29</depend> - <support_level>core</support_level> + <support_level>extended</support_level> ***/ #include "asterisk.h" @@ -936,7 +936,7 @@ static int unload_module(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk MS Exchange Web Service Calendar Integration", - .support_level = AST_MODULE_SUPPORT_CORE, + .support_level = AST_MODULE_SUPPORT_EXTENDED, .load = load_module, .unload = unload_module, .load_pri = AST_MODPRI_DEVSTATE_PLUGIN, diff --git a/res/res_calendar_exchange.c b/res/res_calendar_exchange.c index 7292ecc46..99dc5e6ec 100644 --- a/res/res_calendar_exchange.c +++ b/res/res_calendar_exchange.c @@ -24,7 +24,7 @@ <depend>neon</depend> <depend>ical</depend> <depend>iksemel</depend> - <support_level>core</support_level> + <support_level>extended</support_level> ***/ #include "asterisk.h" @@ -739,7 +739,7 @@ static int unload_module(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk MS Exchange Calendar Integration", - .support_level = AST_MODULE_SUPPORT_CORE, + .support_level = AST_MODULE_SUPPORT_EXTENDED, .load = load_module, .unload = unload_module, .load_pri = AST_MODPRI_DEVSTATE_PLUGIN, diff --git a/res/res_calendar_icalendar.c b/res/res_calendar_icalendar.c index 795a35bd9..4139cf449 100644 --- a/res/res_calendar_icalendar.c +++ b/res/res_calendar_icalendar.c @@ -23,7 +23,7 @@ /*** MODULEINFO <depend>neon</depend> <depend>ical</depend> - <support_level>core</support_level> + <support_level>extended</support_level> ***/ #include "asterisk.h" @@ -502,7 +502,7 @@ static int unload_module(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk iCalendar .ics file integration", - .support_level = AST_MODULE_SUPPORT_CORE, + .support_level = AST_MODULE_SUPPORT_EXTENDED, .load = load_module, .unload = unload_module, .load_pri = AST_MODPRI_DEVSTATE_PLUGIN, diff --git a/res/res_pjsip_t38.c b/res/res_pjsip_t38.c index 2e6049341..6dec6ef5e 100644 --- a/res/res_pjsip_t38.c +++ b/res/res_pjsip_t38.c @@ -302,9 +302,9 @@ static int t38_reinvite_response_cb(struct ast_sip_session *session, pjsip_rx_da } state = t38_state_get_or_alloc(session); - if (!state) { + if (!session->channel || !state) { ast_log(LOG_WARNING, "Received response to T.38 re-invite on '%s' but state unavailable\n", - ast_channel_name(session->channel)); + session->channel ? ast_channel_name(session->channel) : "unknown channel"); return 0; } diff --git a/res/res_smdi.c b/res/res_smdi.c index 7f9af5cd5..4d7240104 100644 --- a/res/res_smdi.c +++ b/res/res_smdi.c @@ -41,7 +41,7 @@ */ /*** MODULEINFO - <support_level>core</support_level> + <support_level>extended</support_level> ***/ #include "asterisk.h" @@ -1429,7 +1429,7 @@ static int reload(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Simplified Message Desk Interface (SMDI) Resource", - .support_level = AST_MODULE_SUPPORT_CORE, + .support_level = AST_MODULE_SUPPORT_EXTENDED, .load = load_module, .unload = unload_module, .reload = reload, |