Commit cacabcae authored by jehan's avatar jehan
Browse files

fix merging issue

parent efea46b2
......@@ -144,7 +144,7 @@ static int stream_channel_process_data(belle_sip_channel_t *obj,unsigned int rev
channel_process_queue(obj);
return BELLE_SIP_STOP;
}
belle_sip_source_set_event((belle_sip_source_t*)obj,BELLE_SIP_EVENT_READ|BELLE_SIP_EVENT_ERROR);
belle_sip_source_set_events((belle_sip_source_t*)obj,BELLE_SIP_EVENT_READ|BELLE_SIP_EVENT_ERROR);
belle_sip_channel_set_ready(obj,(struct sockaddr*)&ss,addrlen);
return BELLE_SIP_CONTINUE;
......@@ -154,6 +154,7 @@ static int stream_channel_process_data(belle_sip_channel_t *obj,unsigned int rev
belle_sip_warning("Unexpected event [%i], for channel [%p]",revents,obj);
}
return BELLE_SIP_CONTINUE;
}
belle_sip_channel_t * belle_sip_channel_new_tcp(belle_sip_stack_t *stack,const char *bindip, int localport, const char *dest, int port){
belle_sip_stream_channel_t *obj=belle_sip_object_new(belle_sip_stream_channel_t);
......
......@@ -99,7 +99,7 @@ static int process_data(belle_sip_channel_t *obj,unsigned int revents){
return BELLE_SIP_STOP;
}
/*connected, now etablishing TLS connection*/
belle_sip_source_set_event((belle_sip_source_t*)obj,BELLE_SIP_EVENT_READ|BELLE_SIP_EVENT_ERROR);
belle_sip_source_set_events((belle_sip_source_t*)obj,BELLE_SIP_EVENT_READ|BELLE_SIP_EVENT_ERROR);
belle_sip_channel_set_ready(obj,(struct sockaddr*)&ss,addrlen);
return BELLE_SIP_CONTINUE;
......
......@@ -30,7 +30,8 @@ static int cleanup_cast_suite(){
static void cast_test(){
belle_sip_stack_t *stack=belle_sip_stack_new(NULL);
belle_sip_listening_point_t *lp=belle_sip_stack_create_listening_point(stack,"0.0.0.0",5060,"UDP");
belle_sip_listening_point_t *lp=belle_sip_stack_create_listening_point(stack,"0.0.0.0",5040,"UDP");
CU_ASSERT_PTR_NOT_NULL(lp);
belle_sip_provider_t *provider=belle_sip_stack_create_provider(stack,lp);
belle_sip_request_t *req=belle_sip_request_new();
belle_sip_response_t *resp=belle_sip_response_new();
......@@ -38,7 +39,7 @@ static void cast_test(){
int tmp;
CU_ASSERT_PTR_NOT_NULL(stack);
CU_ASSERT_PTR_NOT_NULL(lp);
CU_ASSERT_PTR_NOT_NULL(provider);
CU_ASSERT_PTR_NOT_NULL(req);
CU_ASSERT_PTR_NOT_NULL(resp);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment