niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change meaningless "ospl_" prefix on configuration structures to "config_"

Browse source 
Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2019-02-14 12:43:34 +01:00
parent 707045256a
commit c10a52c494
3 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/core/ddsi/include/ddsi/q_globals.h
View file

@ -51,10 +51,10 @@ struct ut_thread_pool_s;
struct debug_monitor; struct debug_monitor;
struct ddsi_tkmap; struct ddsi_tkmap;
typedef struct ospl_in_addr_node { typedef struct config_in_addr_node {
nn_locator_t loc; nn_locator_t loc;
struct ospl_in_addr_node *next; struct config_in_addr_node *next;
} ospl_in_addr_node; } config_in_addr_node;
enum recvips_mode { enum recvips_mode {
RECVIPS_MODE_ALL, /* all MC capable interfaces */ RECVIPS_MODE_ALL, /* all MC capable interfaces */
@ -174,7 +174,7 @@ struct q_globals {
advertised in discovery messages (so that an external IP address on advertised in discovery messages (so that an external IP address on
a NAT may be advertised), and the DDSI multi-cast address. */ a NAT may be advertised), and the DDSI multi-cast address. */
enum recvips_mode recvips_mode; enum recvips_mode recvips_mode;
struct ospl_in_addr_node *recvips; struct config_in_addr_node *recvips;
nn_locator_t extmask; nn_locator_t extmask;
nn_locator_t ownloc; nn_locator_t ownloc;

2
src/core/ddsi/src/ddsi_mcgroup.c
View file

@ -165,7 +165,7 @@ static int joinleave_mcgroup (ddsi_tran_conn_t conn, int join, const nn_locator_
static int interface_in_recvips_p (const struct nn_interface *interf) static int interface_in_recvips_p (const struct nn_interface *interf)
{ {
struct ospl_in_addr_node *nodeaddr; struct config_in_addr_node *nodeaddr;
for (nodeaddr = gv.recvips; nodeaddr; nodeaddr = nodeaddr->next) for (nodeaddr = gv.recvips; nodeaddr; nodeaddr = nodeaddr->next)
{ {
if (locator_compare_no_port(&nodeaddr->loc, &interf->loc) == 0) if (locator_compare_no_port(&nodeaddr->loc, &interf->loc) == 0)

13
src/core/ddsi/src/q_init.c
View file

@ -204,7 +204,7 @@ static int set_recvips (void)
#endif #endif
else else
{ {
struct ospl_in_addr_node **recvnode = &gv.recvips; struct config_in_addr_node **recvnode = &gv.recvips;
int i, j; int i, j;
gv.recvips_mode = RECVIPS_MODE_SOME; gv.recvips_mode = RECVIPS_MODE_SOME;
for (i = 0; config.networkRecvAddressStrings[i] != NULL; i++) for (i = 0; config.networkRecvAddressStrings[i] != NULL; i++)
@ -225,7 +225,7 @@ static int set_recvips (void)
DDS_ERROR("No interface bound to requested address '%s'\n", config.networkRecvAddressStrings[i]); DDS_ERROR("No interface bound to requested address '%s'\n", config.networkRecvAddressStrings[i]);
return -1; return -1;
} }
*recvnode = os_malloc (sizeof (struct ospl_in_addr_node)); *recvnode = os_malloc (sizeof (struct config_in_addr_node));
(*recvnode)->loc = loc; (*recvnode)->loc = loc;
recvnode = &(*recvnode)->next; recvnode = &(*recvnode)->next;
*recvnode = NULL; *recvnode = NULL;
@ -584,8 +584,7 @@ int rtps_config_prep (struct cfgst *cfgst)
if it had been created using create_thread(). */ if it had been created using create_thread(). */
{ {
/* For Lite - Temporary /* Temporary: thread states for each application thread is managed using thread_states structure
Thread states for each application thread is managed using thread_states structure
*/ */
#define USER_MAX_THREADS 50 #define USER_MAX_THREADS 50
@ -864,8 +863,6 @@ int rtps_init (void)
uint32_t port_data_uc = 0; uint32_t port_data_uc = 0;
bool mc_available = true; bool mc_available = true;
/* Initialize implementation (Lite or OSPL) */
ddsi_plugin_init (); ddsi_plugin_init ();
ddsi_iid_init (); ddsi_iid_init ();
@ -1386,7 +1383,7 @@ err_network_partition_addrset:
err_set_ext_address: err_set_ext_address:
while (gv.recvips) while (gv.recvips)
{ {
struct ospl_in_addr_node *n = gv.recvips; struct config_in_addr_node *n = gv.recvips;
gv.recvips = n->next; gv.recvips = n->next;
os_free (n); os_free (n);
} }
@ -1670,7 +1667,7 @@ void rtps_fini (void)
while (gv.recvips) while (gv.recvips)
{ {
struct ospl_in_addr_node *n = gv.recvips; struct config_in_addr_node *n = gv.recvips;
/* The compiler doesn't realize that n->next is always initialized. */ /* The compiler doesn't realize that n->next is always initialized. */
OS_WARNING_MSVC_OFF(6001); OS_WARNING_MSVC_OFF(6001);
gv.recvips = n->next; gv.recvips = n->next;