[Freeswitch-users] Failed to patch FS v1.0.6 with Gmail/Google support for inbound calls

[mazilo]

Referring to this 
http://freeswitch-users.2379917.n2.nabble.com/Need-help-testing-GV-features-tp5497472p5498995.html
post , I quoted below the links to the patches as shown below.

mercutioviz wrote:
> Outbound gmail/goog voice:
> http://fisheye.freeswitch.org/changelog/freeswitch.git/?cs=ba0a2a32ba29d19cbb21f17ad31b42a093398d7d
> http://fisheye.freeswitch.org/changelog/freeswitch.git/?cs=9af30563e29bc250d2ef75d06e593774811e4699
> 
> Inbound goog voice:
> http://fisheye.freeswitch.org/changelog/freeswitch.git/?cs=4ee68141d794dd4a296792e0b81c5a20a95d5d89
OK. Now, I can see the above link with no problems. I can even apply the 1st
two patches for outbound gmail/google voice on my local freeswitch-1.0.6
source. However, I am having problem to follow the last patch for the
inbound google voice to patch
src/mod/endpoints/mod_dingaling/mod_dingaling.c file. When I tried to patch
the src/mod/endpoints/mod_dingaling/mod_dingaling.c file, I got the
following error messages:

[mazilo at Mi:/opt/tmp/freeswitch-1.0.6 98%] ~ patch -p0 <
../mod_dingaling.patch 
patching file src/mod/endpoints/mod_dingaling/mod_dingaling.c
Hunk #1 FAILED at 1002.
Hunk #2 succeeded at 2964 (offset -16 lines).
Hunk #3 succeeded at 3011 (offset -16 lines).
Hunk #4 succeeded at 3051 (offset -16 lines).
Hunk #5 succeeded at 3083 (offset -16 lines).
Hunk #6 succeeded at 3229 (offset -21 lines).
Hunk #7 succeeded at 3259 (offset -21 lines).
Hunk #8 succeeded at 3276 (offset -21 lines).
Hunk #9 succeeded at 3319 (offset -21 lines).
1 out of 9 hunks FAILED -- saving rejects to file
src/mod/endpoints/mod_dingaling/mod_dingaling.c.rej
[mazilo at Mi:/opt/tmp/freeswitch-1.0.6 99%] ~
Here is the Hunk #1 code:
diff -u -N -rba0a2a32ba29d19cbb21f17ad31b42a093398d7d
-r4ee68141d794dd4a296792e0b81c5a20a95d5d89
--- src/mod/endpoints/mod_dingaling/mod_dingaling.c    
(.../mod_dingaling.c)   (revision ba0a2a32ba29d19cbb21f17ad31b42a093398d7d)
+++ src/mod/endpoints/mod_dingaling/mod_dingaling.c    
(.../mod_dingaling.c)   (revision 4ee68141d794dd4a296792e0b81c5a20a95d5d89)
@@ -1002,7 +1002,7 @@
               
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session),
SWITCH_LOG_DEBUG, "Send Candidate %s:%d [%s]\n", cand[0].address,
cand[0].port,
                                                  cand[0].username);

-               if (ldl_session_gateway(tech_pvt->dlsession)) {
+               if (ldl_session_gateway(tech_pvt->dlsession) &&
switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) {
                        tech_pvt->cand_id =
ldl_session_transport(tech_pvt->dlsession, cand, 1);
                } else {
                        tech_pvt->cand_id =
ldl_session_candidates(tech_pvt->dlsession, cand, 1);
The following will show the corresponding section (Hunk #1) from my
src/mod/endpoints/mod_dingaling/mod_dingaling.c file that failed to patch:
1001                 cand[0].protocol = "udp";
1002                
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session)     ,
SWITCH_LOG_DEBUG, "Send Candidate %s:%d [%s]\n", cand[0].address,
cand[0].por     t,
1003                                                   cand[0].username);
1004                 tech_pvt->cand_id =
ldl_session_candidates(tech_pvt->dlsession,      cand, 1);
1005                 switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT);
1006                 switch_set_flag_locked(tech_pvt, TFLAG_RTP_READY);
1007         }
1008         switch_clear_flag_locked(tech_pvt, TFLAG_DO_CAND);
1009         return 1;
1010 }
1011 
1012 static char *lame(char *in)
1013 {
1014         if (!strncasecmp(in, "ilbc", 4)) {
1015                 return "iLBC";
1016         } else {
Here is the corresponding rejection
src/mod/endpoints/mod_dingaling/mod_dingaling.c.rej file:
--- src/mod/endpoints/mod_dingaling/mod_dingaling.c    
(.../mod_dingaling.c)   (revision ba0a2a32ba29d19cbb21f17ad31b42a093398d7d)
+++ src/mod/endpoints/mod_dingaling/mod_dingaling.c    
(.../mod_dingaling.c)   (revision 4ee68141d794dd4a296792e0b81c5a20a95d5d89)
@@ -1002,7 +1002,7 @@
               
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session),
SWITCH_LOG_DEBUG, "Send Candidate %s:%d [%s]\n", cand[0].address,
cand[0].port,
                                                  cand[0].username);
 
-               if (ldl_session_gateway(tech_pvt->dlsession)) {
+               if (ldl_session_gateway(tech_pvt->dlsession) &&
switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) {
                        tech_pvt->cand_id =
ldl_session_transport(tech_pvt->dlsession, cand, 1);
                } else {
                        tech_pvt->cand_id =
ldl_session_candidates(tech_pvt->dlsession, cand, 1);
I am no programmer, so I wouldn't know if the above rejection will cause any
harm. If so, I sure would like some advice here to proceed.

Thanks.

-----
don't and stop are the ONLY two 4-letter words considered offensive to men,
but not when used together.
-- 
View this message in context: http://freeswitch-users.2379917.n2.nabble.com/Failed-to-patch-FS-v1-0-6-with-Gmail-Google-support-for-inbound-calls-tp5507344p5507344.html
Sent from the freeswitch-users mailing list archive at Nabble.com.