Don't count as outgoing until we actually send the new INVITE

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3092 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 6411de4f813814168c243241f0d05f7b86726477..dd11efbda2ca4b7827881273ae9475761365dfb8 100755 (executable)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -24,6 +24,7 @@
 #include <asterisk/options.h>
 #include <asterisk/cli.h>
 #include <asterisk/say.h>
+#include <asterisk/utils.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 15c3f811b9da0074462733e8774ed44a9eb60c9a..8968ea839e0fdeb0a4b64ca8a426770974054fb0 100755 (executable)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -7765,7 +7765,6 @@ static int sip_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, struc
                                ast_log(LOG_DEBUG, "Deferring reinvite on '%s'\n", p->callid);
                                p->needreinvite = 1;
                        }
-                       p->outgoing = 1;
                }
                return 0;
        }