[Freeswitch-branches] [commit] r3851 - in freeswitch/branches/knhor/trunk: . libs/libresample libs/libresample/libresample.xcodeproj libs/libteletone libs/libteletone/libteletone.xcodeproj src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_sofia

[Freeswitch SVN]

Author: knhor
Date: Wed Dec 27 13:49:11 2006
New Revision: 3851

Added:
   freeswitch/branches/knhor/trunk/libs/libresample/libresample-Info.plist
      - copied unchanged from r3850, /freeswitch/trunk/libs/libresample/libresample-Info.plist
   freeswitch/branches/knhor/trunk/libs/libresample/libresample.xcodeproj/
      - copied from r3850, /freeswitch/trunk/libs/libresample/libresample.xcodeproj/
   freeswitch/branches/knhor/trunk/libs/libresample/libresample.xcodeproj/project.pbxproj
      - copied unchanged from r3850, /freeswitch/trunk/libs/libresample/libresample.xcodeproj/project.pbxproj
   freeswitch/branches/knhor/trunk/libs/libteletone/libteletone-Info.plist
      - copied unchanged from r3850, /freeswitch/trunk/libs/libteletone/libteletone-Info.plist
   freeswitch/branches/knhor/trunk/libs/libteletone/libteletone.xcodeproj/
      - copied from r3850, /freeswitch/trunk/libs/libteletone/libteletone.xcodeproj/
   freeswitch/branches/knhor/trunk/libs/libteletone/libteletone.xcodeproj/project.pbxproj
      - copied unchanged from r3850, /freeswitch/trunk/libs/libteletone/libteletone.xcodeproj/project.pbxproj
Modified:
   freeswitch/branches/knhor/trunk/   (props changed)
   freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c
   freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c

Log:
Merged revisions 3841-3850 via svnmerge from trunk


Modified: freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c
==============================================================================
--- freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c	(original)
+++ freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c	Wed Dec 27 13:49:11 2006
@@ -391,7 +391,7 @@
 
 static switch_status_t chat_send(char *proto, char *from, char *to, char *subject, char *body, char *hint)
 {
-	char *user, *host, *f_user = NULL, *ffrom = NULL, *f_host = NULL;
+	char *user, *host, *f_user = NULL, *ffrom = NULL, *f_host = NULL, *f_resource = NULL;
 	struct mdl_profile *profile = NULL;
 
 	assert(proto != NULL);
@@ -399,6 +399,9 @@
 	if (from && (f_user = strdup(from))) {
 		if ((f_host = strchr(f_user, '@'))) {
 			*f_host++ = '\0';
+            if ((f_resource = strchr(f_host, '/'))) {
+                *f_resource++ = '\0';
+            }
 		}
 	}
 

Modified: freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
==============================================================================
--- freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	(original)
+++ freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	Wed Dec 27 13:49:11 2006
@@ -1612,13 +1612,13 @@
 
 			if (tech_pvt->read_frame.datalen > 0) {
                 size_t bytes = 0;
-                int frames = 0;
+                int frames = 1;
 				//tech_pvt->last_read = switch_time_now();
                 if (!switch_test_flag((&tech_pvt->read_frame), SFF_CNG)) {
                     if ((bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame)) {
                         frames = (tech_pvt->read_frame.datalen / bytes);
-                        tech_pvt->read_frame.samples = (int) (frames * tech_pvt->read_codec.implementation->samples_per_frame);
                     }
+                    tech_pvt->read_frame.samples = (int) (frames * tech_pvt->read_codec.implementation->samples_per_frame);
                 }
 				break;
 			}