Failed to patch FS v1.0.6 with Gmail/Google support for inbound calls
Referring to this http://freeswitch-users.2379917.n2.nabble.com/Need-help-testing-GV-features-... 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=ba0a2a32ba29d19cb... http://fisheye.freeswitch.org/changelog/freeswitch.git/?cs=9af30563e29bc250d...
Inbound goog voice: http://fisheye.freeswitch.org/changelog/freeswitch.git/?cs=4ee68141d794dd4a2... 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@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@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... Sent from the freeswitch-users mailing list archive at Nabble.com.
Download GIT head and run it. /b On Sep 7, 2010, at 1:03 PM, mazilo wrote:
Referring to this http://freeswitch-users.2379917.n2.nabble.com/Need-help-testing-GV-features-... post , I quoted below the links to the patches as shown below.
you would be daft to prefer 1.0.6 over the latest GIT HEAD. we are essentially holding our hand over the button on 1.0.7 with 1200+ fixes. On Tue, Sep 7, 2010 at 12:03 PM, mazilo <Nabble@slickdeals.endjunk.com> wrote:
Referring to this http://freeswitch-users.2379917.n2.nabble.com/Need-help-testing-GV-features-... 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=ba0a2a32ba29d19cb... http://fisheye.freeswitch.org/changelog/freeswitch.git/?cs=9af30563e29bc250d...
Inbound goog voice: http://fisheye.freeswitch.org/changelog/freeswitch.git/?cs=4ee68141d794dd4a2... 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@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@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... Sent from the freeswitch-users mailing list archive at Nabble.com.
_______________________________________________ FreeSWITCH-users mailing list FreeSWITCH-users@lists.freeswitch.org http://lists.freeswitch.org/mailman/listinfo/freeswitch-users UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users http://www.freeswitch.org
-- Anthony Minessale II FreeSWITCH http://www.freeswitch.org/ ClueCon http://www.cluecon.com/ Twitter: http://twitter.com/FreeSWITCH_wire AIM: anthm MSN:anthony_minessale@hotmail.com GTALK/JABBER/PAYPAL:anthony.minessale@gmail.com IRC: irc.freenode.net #freeswitch FreeSWITCH Developer Conference sip:888@conference.freeswitch.org googletalk:conf+888@conference.freeswitch.org pstn:+19193869900
Anthony Minessale wrote:
you would be daft to prefer 1.0.6 over the latest GIT HEAD.
It is not my preference to choose one version over the other. I am using FS v1.0.6 hosted on a Seagate http://www.seagate.com/www/en-us/products/network_storage/freeagent_dockstar... DockStar device running an OpenWRT OS. Since FS v1.0.6 can be cleanly compiled out of the box and is currently the only version supported, it is the ONLY choise I have in order to avoid messes in compilation of a newer version. we are essentially holding our hand over the button on 1.0.7 with 1200+ fixes. I can wait for this when it is out and when it gets supported by OpenWRT. Until then, I sure would like to know if anyone out here is willing to help to patch the support for GMail/Google Chat on FS v1.0.6. ----- 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... Sent from the freeswitch-users mailing list archive at Nabble.com.
if you insist, don't patch just replace the mod_dingaling.c and libs/dingaling/src/* remove the new extra 'flags' param to switch_core_session_request if ((*new_session = switch_core_session_request(dingaling_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, flags, pool)) != 0) { becomes if ((*new_session = switch_core_session_request(dingaling_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool)) != 0) { sigh, the openwrt package just builds an rpm from the *as is* tarball from source iirc. On Tue, Sep 7, 2010 at 1:24 PM, mazilo <Nabble@slickdeals.endjunk.com> wrote:
Anthony Minessale wrote:
you would be daft to prefer 1.0.6 over the latest GIT HEAD.
It is not my preference to choose one version over the other. I am using FS v1.0.6 hosted on a Seagate http://www.seagate.com/www/en-us/products/network_storage/freeagent_dockstar... DockStar device running an OpenWRT OS. Since FS v1.0.6 can be cleanly compiled out of the box and is currently the only version supported, it is the ONLY choise I have in order to avoid messes in compilation of a newer version.
we are essentially holding our hand over the button on 1.0.7 with 1200+ fixes. I can wait for this when it is out and when it gets supported by OpenWRT. Until then, I sure would like to know if anyone out here is willing to help to patch the support for GMail/Google Chat on FS v1.0.6.
----- 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... Sent from the freeswitch-users mailing list archive at Nabble.com.
_______________________________________________ FreeSWITCH-users mailing list FreeSWITCH-users@lists.freeswitch.org http://lists.freeswitch.org/mailman/listinfo/freeswitch-users UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users http://www.freeswitch.org
-- Anthony Minessale II FreeSWITCH http://www.freeswitch.org/ ClueCon http://www.cluecon.com/ Twitter: http://twitter.com/FreeSWITCH_wire AIM: anthm MSN:anthony_minessale@hotmail.com GTALK/JABBER/PAYPAL:anthony.minessale@gmail.com IRC: irc.freenode.net #freeswitch FreeSWITCH Developer Conference sip:888@conference.freeswitch.org googletalk:conf+888@conference.freeswitch.org pstn:+19193869900
First, I must apologize for wasting the resource here. I successfully reapplied the patches from scratch and now it even cleanly compiled to produce the binary package for installation. But, my problem is mod_dingaling doesn't want to load and it crashes my FS when loaded (which I believe has nothing to do with the patches). I will create a new post detailing about this crash. Thank you all. ----- 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... Sent from the freeswitch-users mailing list archive at Nabble.com.
participants (3)
-
Anthony Minessale
-
Brian West
-
mazilo