Author: anthm Date: Fri Apr 6 22:10:17 2007 New Revision: 4877 Modified: freeswitch/trunk/libs/apr/include/arch/unix/apr_private.h.in freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: merge 2 Modified: freeswitch/trunk/libs/apr/include/arch/unix/apr_private.h.in ============================================================================== --- freeswitch/trunk/libs/apr/include/arch/unix/apr_private.h.in (original) +++ freeswitch/trunk/libs/apr/include/arch/unix/apr_private.h.in Fri Apr 6 22:10:17 2007 @@ -632,16 +632,16 @@ /* */ #undef SIGWAIT_TAKES_ONE_ARG -/* The size of a `char', as computed by sizeof. */ +/* The size of `char', as computed by sizeof. */ #undef SIZEOF_CHAR -/* The size of a `int', as computed by sizeof. */ +/* The size of `int', as computed by sizeof. */ #undef SIZEOF_INT -/* The size of a `long', as computed by sizeof. */ +/* The size of `long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The size of a `long long', as computed by sizeof. */ +/* The size of `long long', as computed by sizeof. */ #undef SIZEOF_LONG_LONG /* The size of off_t */ @@ -650,7 +650,7 @@ /* The size of pid_t */ #undef SIZEOF_PID_T -/* The size of a `short', as computed by sizeof. */ +/* The size of `short', as computed by sizeof. */ #undef SIZEOF_SHORT /* The size of size_t */ @@ -659,7 +659,7 @@ /* The size of ssize_t */ #undef SIZEOF_SSIZE_T -/* The size of a `void*', as computed by sizeof. */ +/* The size of `void*', as computed by sizeof. */ #undef SIZEOF_VOIDP /* Define to 1 if you have the ANSI C header files. */ @@ -752,13 +752,13 @@ #undef inline #endif -/* Define to `long' if <sys/types.h> does not define. */ +/* Define to `long int' if <sys/types.h> does not define. */ #undef off_t /* Define to `int' if <sys/types.h> does not define. */ #undef pid_t -/* Define to `unsigned' if <sys/types.h> does not define. */ +/* Define to `unsigned int' if <sys/types.h> does not define. */ #undef size_t /* Define to `int' if <sys/types.h> does not define. */ Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Fri Apr 6 22:10:17 2007 @@ -640,7 +640,7 @@ iks *iq, *query, *tag; uint8_t send = 0; int x; - + printf("WTF ?????\n"); if (pak && pak->query) { ns = iks_find_attrib(pak->query, "xmlns"); node = iks_find_attrib(pak->query, "node"); @@ -766,6 +766,7 @@ if (resource && strstr(resource, "talk") && (buffer = apr_hash_get(handle->probe_hash, id, APR_HASH_KEY_STRING))) { + printf("WTF Lookup %s\n", from); apr_cpystrn(buffer->buf, from, buffer->len); fflush(stderr); buffer->hit = 1; Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Fri Apr 6 22:10:17 2007 @@ -2543,7 +2543,7 @@ } } else { - if (dl_signal != LDL_SIGNAL_INITIATE) { + if (dl_signal != LDL_SIGNAL_INITIATE && !msg) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session is already dead\n"); status = LDL_STATUS_FALSE; goto done; @@ -2551,6 +2551,7 @@ if ((session = switch_core_session_request(&channel_endpoint_interface, NULL)) != 0) { switch_core_session_add_stream(session, NULL); + if ((tech_pvt = (struct private_object *) switch_core_session_alloc(session, sizeof(struct private_object))) != 0) { memset(tech_pvt, 0, sizeof(*tech_pvt)); switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));