Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
session: cleanup use of api_client_index
[vpp.git]
/
src
/
vnet
/
session
/
application_interface.c
diff --git
a/src/vnet/session/application_interface.c
b/src/vnet/session/application_interface.c
index
3cd8c2f
..
2a09909
100644
(file)
--- a/
src/vnet/session/application_interface.c
+++ b/
src/vnet/session/application_interface.c
@@
-496,11
+496,21
@@
vnet_application_attach (vnet_app_attach_args_t * a)
app_worker_t *app_wrk;
segment_manager_t *sm;
u32 app_ns_index = 0;
app_worker_t *app_wrk;
segment_manager_t *sm;
u32 app_ns_index = 0;
+ u8 *app_name = 0;
u64 secret;
int rv;
if (a->api_client_index != APP_INVALID_INDEX)
u64 secret;
int rv;
if (a->api_client_index != APP_INVALID_INDEX)
- app = application_lookup (a->api_client_index);
+ {
+ app = application_lookup (a->api_client_index);
+ if (!app)
+ {
+ vl_api_registration_t *regp;
+ regp = vl_api_client_index_to_registration (a->api_client_index);
+ app_name = format (0, "%s%c", regp->name, 0);
+ a->name = app_name;
+ }
+ }
else if (a->name)
app = application_lookup_name (a->name);
else
else if (a->name)
app = application_lookup_name (a->name);
else
@@
-524,6
+534,7
@@
vnet_application_attach (vnet_app_attach_args_t * a)
return clib_error_return_code (0, rv, 0, "app default wrk init: %d", rv);
a->app_evt_q = app_wrk->event_queue;
return clib_error_return_code (0, rv, 0, "app default wrk init: %d", rv);
a->app_evt_q = app_wrk->event_queue;
+ app_wrk->api_client_index = a->api_client_index;
sm = segment_manager_get (app_wrk->first_segment_manager);
fs = segment_manager_get_segment_w_lock (sm, 0);
sm = segment_manager_get (app_wrk->first_segment_manager);
fs = segment_manager_get_segment_w_lock (sm, 0);
@@
-534,7
+545,7
@@
vnet_application_attach (vnet_app_attach_args_t * a)
a->segment = &fs->ssvm;
segment_manager_segment_reader_unlock (sm);
a->segment = &fs->ssvm;
segment_manager_segment_reader_unlock (sm);
-
+ vec_free (app_name);
return 0;
}
return 0;
}