Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
host stack: update stale copyright
[vpp.git]
/
src
/
vnet
/
session-apps
/
proxy.c
diff --git
a/src/vnet/session-apps/proxy.c
b/src/vnet/session-apps/proxy.c
index
063c13c
..
0d4cdd4
100644
(file)
--- a/
src/vnet/session-apps/proxy.c
+++ b/
src/vnet/session-apps/proxy.c
@@
-1,5
+1,5
@@
/*
/*
-* Copyright (c) 201
5-2017
Cisco and/or its affiliates.
+* Copyright (c) 201
7-2019
Cisco and/or its affiliates.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at:
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at:
@@
-163,7
+163,7
@@
proxy_disconnect_callback (session_t * s)
static void
proxy_reset_callback (session_t * s)
{
static void
proxy_reset_callback (session_t * s)
{
- clib_warning ("Reset session %U", format_s
tream_s
ession, s, 2);
+ clib_warning ("Reset session %U", format_session, s, 2);
delete_proxy_session (s, 0 /* is_active_open */ );
}
delete_proxy_session (s, 0 /* is_active_open */ );
}
@@
-212,9
+212,10
@@
proxy_rx_callback (session_t * s)
if (svm_fifo_set_event (active_open_tx_fifo))
{
u32 ao_thread_index = active_open_tx_fifo->master_thread_index;
if (svm_fifo_set_event (active_open_tx_fifo))
{
u32 ao_thread_index = active_open_tx_fifo->master_thread_index;
- if (session_send_io_evt_to_thread_custom (active_open_tx_fifo,
+ u32 ao_session_index = active_open_tx_fifo->master_session_index;
+ if (session_send_io_evt_to_thread_custom (&ao_session_index,
ao_thread_index,
ao_thread_index,
-
FIFO_EVENT_APP
_TX))
+
SESSION_IO_EVT
_TX))
clib_warning ("failed to enqueue tx evt");
}
}
clib_warning ("failed to enqueue tx evt");
}
}
@@
-320,7
+321,7
@@
active_open_connected_callback (u32 app_index, u32 opaque,
*/
ASSERT (s->thread_index == thread_index);
if (svm_fifo_set_event (s->tx_fifo))
*/
ASSERT (s->thread_index == thread_index);
if (svm_fifo_set_event (s->tx_fifo))
- session_send_io_evt_to_thread (s->tx_fifo,
FIFO_EVENT_APP
_TX);
+ session_send_io_evt_to_thread (s->tx_fifo,
SESSION_IO_EVT
_TX);
return 0;
}
return 0;
}
@@
-356,9
+357,10
@@
active_open_rx_callback (session_t * s)
if (svm_fifo_set_event (proxy_tx_fifo))
{
u8 thread_index = proxy_tx_fifo->master_thread_index;
if (svm_fifo_set_event (proxy_tx_fifo))
{
u8 thread_index = proxy_tx_fifo->master_thread_index;
- return session_send_io_evt_to_thread_custom (proxy_tx_fifo,
+ u32 session_index = proxy_tx_fifo->master_session_index;
+ return session_send_io_evt_to_thread_custom (&session_index,
thread_index,
thread_index,
-
FIFO_EVENT_APP
_TX);
+
SESSION_IO_EVT
_TX);
}
return 0;
}
return 0;
@@
-463,7
+465,7
@@
static int
proxy_server_listen ()
{
proxy_main_t *pm = &proxy_main;
proxy_server_listen ()
{
proxy_main_t *pm = &proxy_main;
- vnet_
bind
_args_t _a, *a = &_a;
+ vnet_
listen
_args_t _a, *a = &_a;
clib_memset (a, 0, sizeof (*a));
a->app_index = pm->server_app_index;
a->uri = (char *) pm->server_uri;
clib_memset (a, 0, sizeof (*a));
a->app_index = pm->server_app_index;
a->uri = (char *) pm->server_uri;
@@
-507,12
+509,11
@@
proxy_server_create (vlib_main_t * vm)
for (i = 0; i < num_threads; i++)
{
for (i = 0; i < num_threads; i++)
{
- pm->active_open_event_queue[i] =
- session_manager_get_vpp_event_queue (i);
+ pm->active_open_event_queue[i] = session_main_get_vpp_event_queue (i);
ASSERT (pm->active_open_event_queue[i]);
ASSERT (pm->active_open_event_queue[i]);
- pm->server_event_queue[i] = session_ma
nager
_get_vpp_event_queue (i);
+ pm->server_event_queue[i] = session_ma
in
_get_vpp_event_queue (i);
}
return 0;
}
return 0;