kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-01 02:52:32 +00:00
Code Issues Projects Releases Wiki Activity

fix

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4864 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-04-05 20:29:14 +00:00
parent 9b9723cbe8
commit 4fdf7af7b9
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/libdingaling/src/libdingaling.c
View File

@ -81,7 +81,7 @@
static int opt_timeout = 30; static int opt_timeout = 30;
static void sha1_hash(char *out, char *in); static void sha1_hash(char *out, char *in, unsigned int len);
static int b64encode(unsigned char *in, size_t ilen, unsigned char *out, size_t olen); static int b64encode(unsigned char *in, size_t ilen, unsigned char *out, size_t olen);
static void ldl_random_string(char *buf, uint16_t len, char *set); static void ldl_random_string(char *buf, uint16_t len, char *set);
@ -828,7 +828,7 @@ static ldl_avatar_t *ldl_get_avatar(ldl_handle_t *handle, char *path, char *from
ap = malloc(sizeof(*ap)); ap = malloc(sizeof(*ap));
assert(ap != NULL); assert(ap != NULL);
memset(ap, 0, sizeof(*ap)); memset(ap, 0, sizeof(*ap));
sha1_hash(ap->hash, (char *)image); sha1_hash(ap->hash, (char *)image, bytes);
ap->path = strdup(path); ap->path = strdup(path);
key = ldl_handle_strdup(handle, from); key = ldl_handle_strdup(handle, from);
@ -1110,7 +1110,7 @@ static int b64encode(unsigned char *in, size_t ilen, unsigned char *out, size_t
return 0; return 0;
} }
static void sha1_hash(char *out, char *in) static void sha1_hash(char *out, char *in, unsigned int len)
{ {
sha_context_t sha; sha_context_t sha;
char *p; char *p;
@ -1119,7 +1119,7 @@ static void sha1_hash(char *out, char *in)
SHA1Init(&sha); SHA1Init(&sha);
SHA1Update(&sha, (unsigned char *) in, (unsigned int)strlen(in)); SHA1Update(&sha, (unsigned char *) in, len);
SHA1Final(digest, &sha); SHA1Final(digest, &sha);
@ -1146,7 +1146,7 @@ static int on_stream_component(ldl_handle_t *handle, int type, iks *node)
char handshake[512] = ""; char handshake[512] = "";
snprintf(secret, sizeof(secret), "%s%s", pak->id, handle->password); snprintf(secret, sizeof(secret), "%s%s", pak->id, handle->password);
sha1_hash(hash, secret); sha1_hash(hash, secret, strlen(secret));
snprintf(handshake, sizeof(handshake), "<handshake>%s</handshake>", hash); snprintf(handshake, sizeof(handshake), "<handshake>%s</handshake>", hash);
iks_send_raw(handle->parser, handshake); iks_send_raw(handle->parser, handshake);
handle->state = CS_START; handle->state = CS_START;

2
src/mod/applications/mod_conference/mod_conference.c
View File

@ -3429,7 +3429,7 @@ static switch_status_t conf_api_main(char *buf, switch_core_session_t *session,
} }
} else { } else {
stream->write_function(stream, "Conference %s not found\n", argv[0]); stream->write_function(stream, "Conference %s not found\n", argv[0]);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Conference %s not found\n", argv[0]); //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Conference %s not found\n", argv[0]);
} }
} }

2
src/mod/endpoints/mod_dingaling/Makefile
View File

@ -9,7 +9,7 @@ IKS_LA=$(IKS_DIR)/src/libiksemel.la
DING_DIR=$(BASE)/libs/libdingaling DING_DIR=$(BASE)/libs/libdingaling
LOCAL_CFLAGS += -I$(DING_DIR)/src -I$(BASE)/libs/iksemel/include LOCAL_CFLAGS += -I$(DING_DIR)/src -I$(BASE)/libs/iksemel/include
LOCAL_OBJS=$(DING_DIR)/src/libdingaling.o $(DING_DIR)/src/sha1.o $(IKS_LA) LOCAL_OBJS=$(DING_DIR)/src/libdingaling.o $(DING_DIR)/src/sha1.o $(IKS_LA)
LOCAL_SOURCES=$(DING_DIR)/src/libdingaling.c $(DING_DIR)/src/sha1.c
include $(BASE)/build/modmake.rules include $(BASE)/build/modmake.rules
$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update $(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update