summaryrefslogtreecommitdiff
path: root/package/asterisk/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-12-04 21:37:31 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2009-12-04 21:37:31 +0100
commit9230fde0381a7dcc7e3d86e954382a01a8fcfd63 (patch)
tree9d91f16d2871df6b1bb1c398b7cbe5478b546918 /package/asterisk/patches
parent9bacd09cc5280924908fc4bba494856bbe37c47f (diff)
parentb047da059a1042a27ba68b1bdc50dd187bd362f4 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/asterisk/patches')
-rw-r--r--package/asterisk/patches/patch-channels_chan_iax2_c20
-rw-r--r--package/asterisk/patches/patch-channels_chan_oss_c37
-rw-r--r--package/asterisk/patches/patch-main_astobj2_c11
-rw-r--r--package/asterisk/patches/patch-main_translate_c11
-rw-r--r--package/asterisk/patches/patch-menuselect-tree12
-rw-r--r--package/asterisk/patches/patch-res_res_features_c11
6 files changed, 102 insertions, 0 deletions
diff --git a/package/asterisk/patches/patch-channels_chan_iax2_c b/package/asterisk/patches/patch-channels_chan_iax2_c
new file mode 100644
index 000000000..f39c2bf5b
--- /dev/null
+++ b/package/asterisk/patches/patch-channels_chan_iax2_c
@@ -0,0 +1,20 @@
+--- asterisk-1.4.27.1.orig/channels/chan_iax2.c 2009-11-10 18:15:57.000000000 +0100
++++ asterisk-1.4.27.1/channels/chan_iax2.c 2009-12-03 20:57:05.000000000 +0100
+@@ -7076,7 +7076,7 @@ static int try_transfer(struct chan_iax2
+
+ memset(&ied, 0, sizeof(ied));
+ if (ies->apparent_addr)
+- bcopy(ies->apparent_addr, &new, sizeof(new));
++ memcpy(&new, ies->apparent_addr, sizeof(new));
+ if (ies->callno)
+ newcall = ies->callno;
+ if (!newcall || !new.sin_addr.s_addr || !new.sin_port) {
+@@ -7235,7 +7235,7 @@ static int iax2_ack_registry(struct iax_
+
+ memset(&us, 0, sizeof(us));
+ if (ies->apparent_addr)
+- bcopy(ies->apparent_addr, &us, sizeof(us));
++ memcpy(&us, ies->apparent_addr, sizeof(us));
+ if (ies->username)
+ ast_copy_string(peer, ies->username, sizeof(peer));
+ if (ies->refresh)
diff --git a/package/asterisk/patches/patch-channels_chan_oss_c b/package/asterisk/patches/patch-channels_chan_oss_c
new file mode 100644
index 000000000..33e9aaad7
--- /dev/null
+++ b/package/asterisk/patches/patch-channels_chan_oss_c
@@ -0,0 +1,37 @@
+--- asterisk-1.4.27.1.orig/channels/chan_oss.c 2009-08-10 21:15:57.000000000 +0200
++++ asterisk-1.4.27.1/channels/chan_oss.c 2009-12-03 20:58:13.000000000 +0100
+@@ -562,7 +562,7 @@ static void send_sound(struct chan_oss_p
+ l = FRAME_SIZE - ofs;
+ if (l > s->datalen - start) /* don't overflow the source */
+ l = s->datalen - start;
+- bcopy(s->data + start, myframe + ofs, l * 2);
++ memcpy(myframe + ofs, s->data + start, l * 2);
+ if (0)
+ ast_log(LOG_WARNING, "send_sound sound %d/%d of %d into %d\n", l_sampsent, l, s->samplen, ofs);
+ l_sampsent += l;
+@@ -573,14 +573,14 @@ static void send_sound(struct chan_oss_p
+ if (l > 0) {
+ if (l > FRAME_SIZE - ofs)
+ l = FRAME_SIZE - ofs;
+- bcopy(silence, myframe + ofs, l * 2);
++ memcpy(myframe + ofs, silence, l * 2);
+ l_sampsent += l;
+ } else { /* silence is over, restart sound if loop */
+ if (s->repeat == 0) { /* last block */
+ o->cursound = -1;
+ o->nosound = 0; /* allow audio data */
+ if (ofs < FRAME_SIZE) /* pad with silence */
+- bcopy(silence, myframe + ofs, (FRAME_SIZE - ofs) * 2);
++ memcpy(myframe + ofs, silence, (FRAME_SIZE - ofs) * 2);
+ }
+ l_sampsent = 0;
+ }
+@@ -905,7 +905,7 @@ static struct ast_frame *oss_read(struct
+
+ /* XXX can be simplified returning &ast_null_frame */
+ /* prepare a NULL frame in case we don't have enough data to return */
+- bzero(f, sizeof(struct ast_frame));
++ memset(f, 0, sizeof(struct ast_frame));
+ f->frametype = AST_FRAME_NULL;
+ f->src = oss_tech.type;
+
diff --git a/package/asterisk/patches/patch-main_astobj2_c b/package/asterisk/patches/patch-main_astobj2_c
new file mode 100644
index 000000000..d8aaf114b
--- /dev/null
+++ b/package/asterisk/patches/patch-main_astobj2_c
@@ -0,0 +1,11 @@
+--- asterisk-1.4.27.1.orig/main/astobj2.c 2009-10-06 03:16:36.000000000 +0200
++++ asterisk-1.4.27.1/main/astobj2.c 2009-12-03 20:54:12.000000000 +0100
+@@ -236,7 +236,7 @@ int ao2_ref(void *user_data, const int d
+ /* for safety, zero-out the astobj2 header and also the
+ * first word of the user-data, which we make sure is always
+ * allocated. */
+- bzero(obj, sizeof(struct astobj2 *) + sizeof(void *) );
++ memset(obj, 0, sizeof(struct astobj2 *) + sizeof(void *) );
+ free(obj);
+ }
+
diff --git a/package/asterisk/patches/patch-main_translate_c b/package/asterisk/patches/patch-main_translate_c
new file mode 100644
index 000000000..36d7c3058
--- /dev/null
+++ b/package/asterisk/patches/patch-main_translate_c
@@ -0,0 +1,11 @@
+--- asterisk-1.4.27.1.orig/main/translate.c 2009-10-21 18:44:49.000000000 +0200
++++ asterisk-1.4.27.1/main/translate.c 2009-12-03 20:53:36.000000000 +0100
+@@ -442,7 +442,7 @@ static void rebuild_matrix(int samples)
+ if (option_debug)
+ ast_log(LOG_DEBUG, "Resetting translation matrix\n");
+
+- bzero(tr_matrix, sizeof(tr_matrix));
++ memset(tr_matrix, 0, sizeof(tr_matrix));
+
+ /* first, compute all direct costs */
+ AST_LIST_TRAVERSE(&translators, t, list) {
diff --git a/package/asterisk/patches/patch-menuselect-tree b/package/asterisk/patches/patch-menuselect-tree
new file mode 100644
index 000000000..6bac1894d
--- /dev/null
+++ b/package/asterisk/patches/patch-menuselect-tree
@@ -0,0 +1,12 @@
+--- asterisk-1.4.27.1.orig/menuselect-tree 2009-11-30 19:30:41.000000000 +0100
++++ asterisk-1.4.27.1/menuselect-tree 2009-12-03 20:55:04.000000000 +0100
+@@ -59,9 +59,6 @@
+ <member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
+ <depend>dahdi</depend>
+ </member>
+-<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
+- <depend>chan_local</depend>
+-</member>
+ <member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
+ </member>
+ <member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
diff --git a/package/asterisk/patches/patch-res_res_features_c b/package/asterisk/patches/patch-res_res_features_c
new file mode 100644
index 000000000..a237fbf97
--- /dev/null
+++ b/package/asterisk/patches/patch-res_res_features_c
@@ -0,0 +1,11 @@
+--- asterisk-1.4.27.1.orig/res/res_features.c 2009-10-20 19:46:37.000000000 +0200
++++ asterisk-1.4.27.1/res/res_features.c 2009-12-03 20:53:57.000000000 +0100
+@@ -279,7 +279,7 @@ static void *ast_bridge_call_thread(void
+ ast_bridge_call(tobj->peer, tobj->chan, &tobj->bconfig);
+ ast_hangup(tobj->chan);
+ ast_hangup(tobj->peer);
+- bzero(tobj, sizeof(*tobj)); /*! \todo XXX for safety */
++ memset(tobj, 0, sizeof(*tobj)); /*! \todo XXX for safety */
+ free(tobj);
+ return NULL;
+ }