Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix session connect_* api message handling.
[vpp.git]
/
src
/
vnet
/
session
/
session_api.c
diff --git
a/src/vnet/session/session_api.c
b/src/vnet/session/session_api.c
index
6bee3e2
..
60d9b4d
100755
(executable)
--- a/
src/vnet/session/session_api.c
+++ b/
src/vnet/session/session_api.c
@@
-155,7
+155,7
@@
int
send_session_connected_callback (u32 app_index, u32 api_context,
stream_session_t * s, u8 is_fail)
{
send_session_connected_callback (u32 app_index, u32 api_context,
stream_session_t * s, u8 is_fail)
{
- vl_api_connect_
uri
_reply_t *mp;
+ vl_api_connect_
session
_reply_t *mp;
unix_shared_memory_queue_t *q;
application_t *app;
unix_shared_memory_queue_t *vpp_queue;
unix_shared_memory_queue_t *q;
application_t *app;
unix_shared_memory_queue_t *vpp_queue;
@@
-167,7
+167,7
@@
send_session_connected_callback (u32 app_index, u32 api_context,
return -1;
mp = vl_msg_api_alloc (sizeof (*mp));
return -1;
mp = vl_msg_api_alloc (sizeof (*mp));
- mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_CONNECT_
URI
_REPLY);
+ mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_CONNECT_
SESSION
_REPLY);
mp->context = api_context;
if (!is_fail)
{
mp->context = api_context;
if (!is_fail)
{
@@
-415,7
+415,7
@@
done:
static void
vl_api_connect_uri_t_handler (vl_api_connect_uri_t * mp)
{
static void
vl_api_connect_uri_t_handler (vl_api_connect_uri_t * mp)
{
- vl_api_connect_
uri
_reply_t *rmp;
+ vl_api_connect_
session
_reply_t *rmp;
vnet_connect_args_t _a, *a = &_a;
application_t *app;
int rv;
vnet_connect_args_t _a, *a = &_a;
application_t *app;
int rv;
@@
-447,7
+447,7
@@
vl_api_connect_uri_t_handler (vl_api_connect_uri_t * mp)
done:
/* *INDENT-OFF* */
done:
/* *INDENT-OFF* */
- REPLY_MACRO (VL_API_CONNECT_
URI
_REPLY);
+ REPLY_MACRO (VL_API_CONNECT_
SESSION
_REPLY);
/* *INDENT-ON* */
}
/* *INDENT-ON* */
}
@@
-593,11
+593,11
@@
vl_api_bind_sock_t_handler (vl_api_bind_sock_t * mp)
app = application_lookup (mp->client_index);
if (app)
{
app = application_lookup (mp->client_index);
if (app)
{
+ ip46_address_t *ip46 = (ip46_address_t *) mp->ip;
+
memset (a, 0, sizeof (*a));
memset (a, 0, sizeof (*a));
- clib_memcpy (&a->tep.ip, mp->ip, (mp->is_ip4 ?
- sizeof (ip4_address_t) :
- sizeof (ip6_address_t)));
a->tep.is_ip4 = mp->is_ip4;
a->tep.is_ip4 = mp->is_ip4;
+ a->tep.ip = *ip46;
a->tep.port = mp->port;
a->tep.vrf = mp->vrf;
a->app_index = app->index;
a->tep.port = mp->port;
a->tep.vrf = mp->vrf;
a->app_index = app->index;
@@
-637,7
+637,7
@@
done:
static void
vl_api_connect_sock_t_handler (vl_api_connect_sock_t * mp)
{
static void
vl_api_connect_sock_t_handler (vl_api_connect_sock_t * mp)
{
- vl_api_connect_s
ock
_reply_t *rmp;
+ vl_api_connect_s
ession
_reply_t *rmp;
vnet_connect_args_t _a, *a = &_a;
application_t *app;
int rv;
vnet_connect_args_t _a, *a = &_a;
application_t *app;
int rv;
@@
-652,16
+652,14
@@
vl_api_connect_sock_t_handler (vl_api_connect_sock_t * mp)
if (app)
{
unix_shared_memory_queue_t *client_q;
if (app)
{
unix_shared_memory_queue_t *client_q;
-
u8 *ip = mp->is_ip4 ? (u8 *) & a->tep.ip.ip4 : (u8 *) & a->tep.
ip;
+
ip46_address_t *ip46 = (ip46_address_t *) mp->
ip;
client_q = vl_api_client_index_to_input_queue (mp->client_index);
mp->client_queue_address = pointer_to_uword (client_q);
a->tep.is_ip4 = mp->is_ip4;
client_q = vl_api_client_index_to_input_queue (mp->client_index);
mp->client_queue_address = pointer_to_uword (client_q);
a->tep.is_ip4 = mp->is_ip4;
+ a->tep.ip = *ip46;
a->tep.port = mp->port;
a->tep.port = mp->port;
-
- clib_memcpy (ip, mp->ip,
- (mp->is_ip4 ? sizeof (ip4_address_t) :
- sizeof (ip6_address_t)));
+ a->tep.vrf = mp->vrf;
a->api_context = mp->context;
a->app_index = app->index;
a->proto = mp->proto;
a->api_context = mp->context;
a->app_index = app->index;
a->proto = mp->proto;
@@
-679,7
+677,7
@@
vl_api_connect_sock_t_handler (vl_api_connect_sock_t * mp)
/* Got some error, relay it */
done:
/* Got some error, relay it */
done:
- REPLY_MACRO (VL_API_CONNECT_S
OCK
_REPLY);
+ REPLY_MACRO (VL_API_CONNECT_S
ESSION
_REPLY);
}
static clib_error_t *
}
static clib_error_t *