This is an automated email from the ASF dual-hosted git repository.
rlenferink pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/develop by this push:
new 0dc9ccc Updated formatting to be conform Celix formatting
0dc9ccc is described below
commit 0dc9ccc6f4b9b9e9810c2d07cf6e420aaa58aafe
Author: Roy Lenferink <[email protected]>
AuthorDate: Sat Jul 27 20:35:18 2019 +0200
Updated formatting to be conform Celix formatting
---
bundles/pubsub/pubsub_admin_tcp/CMakeLists.txt | 26 +--
.../pubsub/pubsub_admin_tcp/src/psa_activator.c | 189 ++++++++++-----------
.../src/pubsub_psa_tcp_constants.h | 76 ++++-----
.../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c | 32 ++--
.../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.h | 28 +--
.../pubsub_admin_tcp/src/pubsub_tcp_common.c | 72 ++++----
.../pubsub_admin_tcp/src/pubsub_tcp_common.h | 32 ++--
.../pubsub_admin_tcp/src/pubsub_tcp_handler.c | 36 ++--
.../pubsub_admin_tcp/src/pubsub_tcp_handler.h | 44 ++---
.../pubsub_admin_tcp/src/pubsub_tcp_msg_header.h | 42 ++---
.../src/pubsub_tcp_topic_receiver.c | 28 +--
.../src/pubsub_tcp_topic_receiver.h | 29 ++--
.../pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c | 28 +--
.../pubsub_admin_tcp/src/pubsub_tcp_topic_sender.h | 29 ++--
14 files changed, 346 insertions(+), 345 deletions(-)
diff --git a/bundles/pubsub/pubsub_admin_tcp/CMakeLists.txt
b/bundles/pubsub/pubsub_admin_tcp/CMakeLists.txt
index 8db6125..0fd4bbc 100644
--- a/bundles/pubsub/pubsub_admin_tcp/CMakeLists.txt
+++ b/bundles/pubsub/pubsub_admin_tcp/CMakeLists.txt
@@ -19,27 +19,27 @@ find_package(Jansson REQUIRED)
find_package(UUID REQUIRED)
add_celix_bundle(celix_pubsub_admin_tcp
- BUNDLE_SYMBOLICNAME "apache_celix_pubsub_admin_tcp"
- VERSION "1.0.0"
- GROUP "Celix/PubSub"
- SOURCES
- src/psa_activator.c
- src/pubsub_tcp_admin.c
- src/pubsub_tcp_topic_sender.c
- src/pubsub_tcp_topic_receiver.c
- src/pubsub_tcp_handler.c
- src/pubsub_tcp_common.c
+ BUNDLE_SYMBOLICNAME "apache_celix_pubsub_admin_tcp"
+ VERSION "1.0.0"
+ GROUP "Celix/PubSub"
+ SOURCES
+ src/psa_activator.c
+ src/pubsub_tcp_admin.c
+ src/pubsub_tcp_topic_sender.c
+ src/pubsub_tcp_topic_receiver.c
+ src/pubsub_tcp_handler.c
+ src/pubsub_tcp_common.c
)
set_target_properties(celix_pubsub_admin_tcp PROPERTIES INSTALL_RPATH
"$ORIGIN")
target_link_libraries(celix_pubsub_admin_tcp PRIVATE
- Celix::pubsub_spi
- Celix::framework Celix::dfi Celix::log_helper
+ Celix::pubsub_spi
+ Celix::framework Celix::dfi Celix::log_helper
)
target_include_directories(celix_pubsub_admin_tcp PRIVATE
${JANSSON_INCLUDE_DIR} src)
# cmake find package UUID set the wrong include dir for OSX
if (NOT APPLE)
- target_include_directories(celix_pubsub_admin_tcp SYSTEM PRIVATE
${UUID_INCLUDE_DIRS})
+ target_include_directories(celix_pubsub_admin_tcp SYSTEM PRIVATE
${UUID_INCLUDE_DIRS})
endif()
install_celix_bundle(celix_pubsub_admin_tcp EXPORT celix COMPONENT pubsub)
diff --git a/bundles/pubsub/pubsub_admin_tcp/src/psa_activator.c
b/bundles/pubsub/pubsub_admin_tcp/src/psa_activator.c
index 183c721..f1501a9 100644
--- a/bundles/pubsub/pubsub_admin_tcp/src/psa_activator.c
+++ b/bundles/pubsub/pubsub_admin_tcp/src/psa_activator.c
@@ -1,23 +1,22 @@
/**
- *Licensed to the Apache Software Foundation (ASF) under one
- *or more contributor license agreements. See the NOTICE file
- *distributed with this work for additional information
- *regarding copyright ownership. The ASF licenses this file
- *to you 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 to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- *Unless required by applicable law or agreed to in writing,
- *software distributed under the License is distributed on an
- *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- *specific language governing permissions and limitations
- *under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
-
#include <stdlib.h>
#include "celix_api.h"
@@ -30,99 +29,99 @@
#include "command.h"
typedef struct psa_tcp_activator {
- log_helper_t *logHelper;
+ log_helper_t *logHelper;
- pubsub_tcp_admin_t *admin;
+ pubsub_tcp_admin_t *admin;
- long serializersTrackerId;
+ long serializersTrackerId;
- pubsub_admin_service_t adminService;
- long adminSvcId;
+ pubsub_admin_service_t adminService;
+ long adminSvcId;
- pubsub_admin_metrics_service_t adminMetricsService;
- long adminMetricsSvcId;
+ pubsub_admin_metrics_service_t adminMetricsService;
+ long adminMetricsSvcId;
- command_service_t cmdSvc;
- long cmdSvcId;
+ command_service_t cmdSvc;
+ long cmdSvcId;
} psa_tcp_activator_t;
int psa_tcp_start(psa_tcp_activator_t *act, celix_bundle_context_t *ctx) {
- act->adminSvcId = -1L;
- act->cmdSvcId = -1L;
- act->serializersTrackerId = -1L;
-
- logHelper_create(ctx, &act->logHelper);
- logHelper_start(act->logHelper);
-
- act->admin = pubsub_tcpAdmin_create(ctx, act->logHelper);
- celix_status_t status = act->admin != NULL ? CELIX_SUCCESS :
CELIX_BUNDLE_EXCEPTION;
-
- //track serializers
- if (status == CELIX_SUCCESS) {
- celix_service_tracking_options_t opts =
CELIX_EMPTY_SERVICE_TRACKING_OPTIONS;
- opts.filter.serviceName = PUBSUB_SERIALIZER_SERVICE_NAME;
- opts.filter.ignoreServiceLanguage = true;
- opts.callbackHandle = act->admin;
- opts.addWithProperties = pubsub_tcpAdmin_addSerializerSvc;
- opts.removeWithProperties = pubsub_tcpAdmin_removeSerializerSvc;
- act->serializersTrackerId =
celix_bundleContext_trackServicesWithOptions(ctx, &opts);
- }
-
- //register pubsub admin service
- if (status == CELIX_SUCCESS) {
- pubsub_admin_service_t *psaSvc = &act->adminService;
- psaSvc->handle = act->admin;
- psaSvc->matchPublisher = pubsub_tcpAdmin_matchPublisher;
- psaSvc->matchSubscriber = pubsub_tcpAdmin_matchSubscriber;
- psaSvc->matchDiscoveredEndpoint =
pubsub_tcpAdmin_matchDiscoveredEndpoint;
- psaSvc->setupTopicSender = pubsub_tcpAdmin_setupTopicSender;
- psaSvc->teardownTopicSender =
pubsub_tcpAdmin_teardownTopicSender;
- psaSvc->setupTopicReceiver = pubsub_tcpAdmin_setupTopicReceiver;
- psaSvc->teardownTopicReceiver =
pubsub_tcpAdmin_teardownTopicReceiver;
- psaSvc->addDiscoveredEndpoint =
pubsub_tcpAdmin_addDiscoveredEndpoint;
- psaSvc->removeDiscoveredEndpoint =
pubsub_tcpAdmin_removeDiscoveredEndpoint;
-
- celix_properties_t *props = celix_properties_create();
- celix_properties_set(props, PUBSUB_ADMIN_SERVICE_TYPE,
PUBSUB_TCP_ADMIN_TYPE);
-
- act->adminSvcId = celix_bundleContext_registerService(ctx,
psaSvc, PUBSUB_ADMIN_SERVICE_NAME, props);
- }
-
- if (status == CELIX_SUCCESS) {
- act->adminMetricsService.handle = act->admin;
- act->adminMetricsService.metrics = pubsub_tcpAdmin_metrics;
-
- celix_properties_t *props = celix_properties_create();
- celix_properties_set(props, PUBSUB_ADMIN_SERVICE_TYPE,
PUBSUB_TCP_ADMIN_TYPE);
-
- act->adminMetricsSvcId =
celix_bundleContext_registerService(ctx, &act->adminMetricsService,
PUBSUB_ADMIN_METRICS_SERVICE_NAME, props);
- }
-
- //register shell command service
- {
- act->cmdSvc.handle = act->admin;
- act->cmdSvc.executeCommand = pubsub_tcpAdmin_executeCommand;
- celix_properties_t *props = celix_properties_create();
- celix_properties_set(props, OSGI_SHELL_COMMAND_NAME, "psa_tcp");
- celix_properties_set(props, OSGI_SHELL_COMMAND_USAGE,
"psa_tcp");
- celix_properties_set(props, OSGI_SHELL_COMMAND_DESCRIPTION,
"Print the information about the TopicSender and TopicReceivers for the TCP
PSA");
- act->cmdSvcId = celix_bundleContext_registerService(ctx,
&act->cmdSvc, OSGI_SHELL_COMMAND_SERVICE_NAME, props);
- }
-
- return status;
+ act->adminSvcId = -1L;
+ act->cmdSvcId = -1L;
+ act->serializersTrackerId = -1L;
+
+ logHelper_create(ctx, &act->logHelper);
+ logHelper_start(act->logHelper);
+
+ act->admin = pubsub_tcpAdmin_create(ctx, act->logHelper);
+ celix_status_t status = act->admin != NULL ? CELIX_SUCCESS :
CELIX_BUNDLE_EXCEPTION;
+
+ //track serializers
+ if (status == CELIX_SUCCESS) {
+ celix_service_tracking_options_t opts =
CELIX_EMPTY_SERVICE_TRACKING_OPTIONS;
+ opts.filter.serviceName = PUBSUB_SERIALIZER_SERVICE_NAME;
+ opts.filter.ignoreServiceLanguage = true;
+ opts.callbackHandle = act->admin;
+ opts.addWithProperties = pubsub_tcpAdmin_addSerializerSvc;
+ opts.removeWithProperties = pubsub_tcpAdmin_removeSerializerSvc;
+ act->serializersTrackerId =
celix_bundleContext_trackServicesWithOptions(ctx, &opts);
+ }
+
+ //register pubsub admin service
+ if (status == CELIX_SUCCESS) {
+ pubsub_admin_service_t *psaSvc = &act->adminService;
+ psaSvc->handle = act->admin;
+ psaSvc->matchPublisher = pubsub_tcpAdmin_matchPublisher;
+ psaSvc->matchSubscriber = pubsub_tcpAdmin_matchSubscriber;
+ psaSvc->matchDiscoveredEndpoint =
pubsub_tcpAdmin_matchDiscoveredEndpoint;
+ psaSvc->setupTopicSender = pubsub_tcpAdmin_setupTopicSender;
+ psaSvc->teardownTopicSender = pubsub_tcpAdmin_teardownTopicSender;
+ psaSvc->setupTopicReceiver = pubsub_tcpAdmin_setupTopicReceiver;
+ psaSvc->teardownTopicReceiver = pubsub_tcpAdmin_teardownTopicReceiver;
+ psaSvc->addDiscoveredEndpoint = pubsub_tcpAdmin_addDiscoveredEndpoint;
+ psaSvc->removeDiscoveredEndpoint =
pubsub_tcpAdmin_removeDiscoveredEndpoint;
+
+ celix_properties_t *props = celix_properties_create();
+ celix_properties_set(props, PUBSUB_ADMIN_SERVICE_TYPE,
PUBSUB_TCP_ADMIN_TYPE);
+
+ act->adminSvcId = celix_bundleContext_registerService(ctx, psaSvc,
PUBSUB_ADMIN_SERVICE_NAME, props);
+ }
+
+ if (status == CELIX_SUCCESS) {
+ act->adminMetricsService.handle = act->admin;
+ act->adminMetricsService.metrics = pubsub_tcpAdmin_metrics;
+
+ celix_properties_t *props = celix_properties_create();
+ celix_properties_set(props, PUBSUB_ADMIN_SERVICE_TYPE,
PUBSUB_TCP_ADMIN_TYPE);
+
+ act->adminMetricsSvcId = celix_bundleContext_registerService(ctx,
&act->adminMetricsService, PUBSUB_ADMIN_METRICS_SERVICE_NAME, props);
+ }
+
+ //register shell command service
+ {
+ act->cmdSvc.handle = act->admin;
+ act->cmdSvc.executeCommand = pubsub_tcpAdmin_executeCommand;
+ celix_properties_t *props = celix_properties_create();
+ celix_properties_set(props, OSGI_SHELL_COMMAND_NAME, "psa_tcp");
+ celix_properties_set(props, OSGI_SHELL_COMMAND_USAGE, "psa_tcp");
+ celix_properties_set(props, OSGI_SHELL_COMMAND_DESCRIPTION, "Print the
information about the TopicSender and TopicReceivers for the TCP PSA");
+ act->cmdSvcId = celix_bundleContext_registerService(ctx, &act->cmdSvc,
OSGI_SHELL_COMMAND_SERVICE_NAME, props);
+ }
+
+ return status;
}
int psa_tcp_stop(psa_tcp_activator_t *act, celix_bundle_context_t *ctx) {
- celix_bundleContext_unregisterService(ctx, act->adminSvcId);
- celix_bundleContext_unregisterService(ctx, act->cmdSvcId);
- celix_bundleContext_unregisterService(ctx, act->adminMetricsSvcId);
- celix_bundleContext_stopTracker(ctx, act->serializersTrackerId);
- pubsub_tcpAdmin_destroy(act->admin);
+ celix_bundleContext_unregisterService(ctx, act->adminSvcId);
+ celix_bundleContext_unregisterService(ctx, act->cmdSvcId);
+ celix_bundleContext_unregisterService(ctx, act->adminMetricsSvcId);
+ celix_bundleContext_stopTracker(ctx, act->serializersTrackerId);
+ pubsub_tcpAdmin_destroy(act->admin);
- logHelper_stop(act->logHelper);
- logHelper_destroy(&act->logHelper);
+ logHelper_stop(act->logHelper);
+ logHelper_destroy(&act->logHelper);
- return CELIX_SUCCESS;
+ return CELIX_SUCCESS;
}
CELIX_GEN_BUNDLE_ACTIVATOR(psa_tcp_activator_t, psa_tcp_start, psa_tcp_stop);
diff --git a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_psa_tcp_constants.h
b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_psa_tcp_constants.h
index a957c83..42ad2fa 100644
--- a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_psa_tcp_constants.h
+++ b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_psa_tcp_constants.h
@@ -1,20 +1,20 @@
/**
- *Licensed to the Apache Software Foundation (ASF) under one
- *or more contributor license agreements. See the NOTICE file
- *distributed with this work for additional information
- *regarding copyright ownership. The ASF licenses this file
- *to you 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 to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- *Unless required by applicable law or agreed to in writing,
- *software distributed under the License is distributed on an
- *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- *specific language governing permissions and limitations
- *under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
#ifndef PUBSUB_PSA_TCP_CONSTANTS_H_
@@ -34,72 +34,72 @@
#define PSA_TCP_DEFAULT_RECV_BUFFER_SIZE 6500000
#define PSA_TCP_DEFAULT_TIMEOUT 500
-#define PSA_TCP_DEFAULT_QOS_SAMPLE_SCORE 30
-#define PSA_TCP_DEFAULT_QOS_CONTROL_SCORE 70
-#define PSA_TCP_DEFAULT_SCORE 30
+#define PSA_TCP_DEFAULT_QOS_SAMPLE_SCORE 30
+#define PSA_TCP_DEFAULT_QOS_CONTROL_SCORE 70
+#define PSA_TCP_DEFAULT_SCORE 30
-#define PSA_TCP_QOS_SAMPLE_SCORE_KEY "PSA_TCP_QOS_SAMPLE_SCORE"
-#define PSA_TCP_QOS_CONTROL_SCORE_KEY "PSA_TCP_QOS_CONTROL_SCORE"
-#define PSA_TCP_DEFAULT_SCORE_KEY
"PSA_TCP_DEFAULT_SCORE"
+#define PSA_TCP_QOS_SAMPLE_SCORE_KEY "PSA_TCP_QOS_SAMPLE_SCORE"
+#define PSA_TCP_QOS_CONTROL_SCORE_KEY "PSA_TCP_QOS_CONTROL_SCORE"
+#define PSA_TCP_DEFAULT_SCORE_KEY "PSA_TCP_DEFAULT_SCORE"
-#define PSA_TCP_METRICS_ENABLED "PSA_TCP_METRICS_ENABLED"
-#define PSA_TCP_DEFAULT_METRICS_ENABLED true
+#define PSA_TCP_METRICS_ENABLED "PSA_TCP_METRICS_ENABLED"
+#define PSA_TCP_DEFAULT_METRICS_ENABLED true
-#define PUBSUB_TCP_VERBOSE_KEY "PSA_TCP_VERBOSE"
-#define PUBSUB_TCP_VERBOSE_DEFAULT true
+#define PUBSUB_TCP_VERBOSE_KEY "PSA_TCP_VERBOSE"
+#define PUBSUB_TCP_VERBOSE_DEFAULT true
-#define PUBSUB_TCP_PSA_IP_KEY "PSA_IP"
-#define PUBSUB_TCP_PSA_ITF_KEY "PSA_INTERFACE"
+#define PUBSUB_TCP_PSA_IP_KEY "PSA_IP"
+#define PUBSUB_TCP_PSA_ITF_KEY "PSA_INTERFACE"
-#define PUBSUB_TCP_DEFAULT_IP "127.0.0.1"
+#define PUBSUB_TCP_DEFAULT_IP "127.0.0.1"
-#define PUBSUB_TCP_ADMIN_TYPE "tcp"
+#define PUBSUB_TCP_ADMIN_TYPE "tcp"
/**
* The TCP url key for the topic sender endpoints
*/
-#define PUBSUB_TCP_URL_KEY "tcp.url"
+#define PUBSUB_TCP_URL_KEY "tcp.url"
/**
* Can be set in the topic properties to fix a static bind url
*/
-#define PUBSUB_TCP_STATIC_BIND_URL "tcp.static.bind.url"
+#define PUBSUB_TCP_STATIC_BIND_URL "tcp.static.bind.url"
/**
* Can be set in the topic properties to fix a static url used for discovery
*/
-#define PUBSUB_TCP_STATIC_DISCOVER_URL "tcp.static.bind.url"
+#define PUBSUB_TCP_STATIC_DISCOVER_URL "tcp.static.bind.url"
/**
* If set true on the endpoint, the tcp TopicSender bind and/or discovery url
is statically configured.
*/
-#define PUBSUB_TCP_STATIC_CONFIGURED "tcp.static.configured"
+#define PUBSUB_TCP_STATIC_CONFIGURED "tcp.static.configured"
/**
* The static url which a subscriber should try to connect to.
* The urls are space separated.
* Can be set in the topic properties.
*/
-#define PUBSUB_TCP_STATIC_CONNECT_URLS "tcp.static.connect.urls"
+#define PUBSUB_TCP_STATIC_CONNECT_URLS "tcp.static.connect.urls"
/**
* The static endpoint type which a static endpoint should be configured.
* Can be set in the topic properties.
*/
-#define PUBSUB_TCP_STATIC_ENDPOINT_TYPE "tcp.static.endpoint.type"
+#define PUBSUB_TCP_STATIC_ENDPOINT_TYPE "tcp.static.endpoint.type"
-#define PUBSUB_TCP_STATIC_ENDPOINT_TYPE_SERVER "server"
-#define PUBSUB_TCP_STATIC_ENDPOINT_TYPE_CLIENT "client"
+#define PUBSUB_TCP_STATIC_ENDPOINT_TYPE_SERVER "server"
+#define PUBSUB_TCP_STATIC_ENDPOINT_TYPE_CLIENT "client"
/**
* Realtime thread prio and scheduling information. This is used to setup the
thread prio/sched of the
* internal TCP threads.
* Can be set in the topic properties.
*/
-#define PUBSUB_TCP_THREAD_REALTIME_PRIO "thread.realtime.prio"
-#define PUBSUB_TCP_THREAD_REALTIME_SCHED "thread.realtime.sched"
+#define PUBSUB_TCP_THREAD_REALTIME_PRIO "thread.realtime.prio"
+#define PUBSUB_TCP_THREAD_REALTIME_SCHED "thread.realtime.sched"
#endif /* PUBSUB_PSA_TCP_CONSTANTS_H_ */
diff --git a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c
b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c
index f6d0720..3ac9555 100644
--- a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c
+++ b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c
@@ -1,20 +1,20 @@
/**
- *Licensed to the Apache Software Foundation (ASF) under one
- *or more contributor license agreements. See the NOTICE file
- *distributed with this work for additional information
- *regarding copyright ownership. The ASF licenses this file
- *to you 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 to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- *Unless required by applicable law or agreed to in writing,
- *software distributed under the License is distributed on an
- *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- *specific language governing permissions and limitations
- *under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
#include <memory.h>
@@ -164,8 +164,8 @@ void pubsub_tcpAdmin_destroy(pubsub_tcp_admin_t *psa) {
celixThreadMutex_lock(&psa->endpointStore.mutex);
hash_map_iterator_t iter =
hashMapIterator_construct(psa->endpointStore.map);
while (hashMapIterator_hasNext(&iter)) {
- pubsub_tcpHandler_t* tcpHandler = hashMapIterator_nextValue(&iter);
- pubsub_tcpHandler_destroy(tcpHandler);
+ pubsub_tcpHandler_t* tcpHandler = hashMapIterator_nextValue(&iter);
+ pubsub_tcpHandler_destroy(tcpHandler);
}
celixThreadMutex_unlock(&psa->endpointStore.mutex);
diff --git a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.h
b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.h
index d21220d..c0a8957 100644
--- a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.h
+++ b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.h
@@ -1,20 +1,20 @@
/**
- *Licensed to the Apache Software Foundation (ASF) under one
- *or more contributor license agreements. See the NOTICE file
- *distributed with this work for additional information
- *regarding copyright ownership. The ASF licenses this file
- *to you 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 to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- *Unless required by applicable law or agreed to in writing,
- *software distributed under the License is distributed on an
- *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- *specific language governing permissions and limitations
- *under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
#ifndef CELIX_PUBSUB_TCP_ADMIN_H
diff --git a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_common.c
b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_common.c
index 4420e0f..28d7f74 100644
--- a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_common.c
+++ b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_common.c
@@ -1,20 +1,20 @@
/**
- *Licensed to the Apache Software Foundation (ASF) under one
- *or more contributor license agreements. See the NOTICE file
- *distributed with this work for additional information
- *regarding copyright ownership. The ASF licenses this file
- *to you 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 to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- *Unless required by applicable law or agreed to in writing,
- *software distributed under the License is distributed on an
- *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- *specific language governing permissions and limitations
- *under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
#include <memory.h>
@@ -112,33 +112,33 @@ void psa_tcp_setupTcpContext(log_helper_t *logHelper,
celix_thread_t *thread, co
//TODO update this to use cap_get_pid and cap-get_flag instead of check user
is root (note adds dep to -lcap)
bool gotPermission = false;
if (getuid() == 0) {
- gotPermission = true;
+ gotPermission = true;
}
long prio = celix_properties_getAsLong(topicProperties,
PUBSUB_TCP_THREAD_REALTIME_PRIO, -1L);
const char *sched = celix_properties_get(topicProperties,
PUBSUB_TCP_THREAD_REALTIME_SCHED, NULL);
if (sched != NULL) {
- int policy = SCHED_OTHER;
- if (strncmp("SCHED_OTHER", sched, 16) == 0) {
- policy = SCHED_OTHER;
- } else if (strncmp("SCHED_BATCH", sched, 16) == 0) {
- policy = SCHED_BATCH;
- } else if (strncmp("SCHED_IDLE", sched, 16) == 0) {
- policy = SCHED_IDLE;
- } else if (strncmp("SCHED_FIFO", sched, 16) == 0) {
- policy = SCHED_FIFO;
- } else if (strncmp("SCHED_RR", sched, 16) == 0) {
- policy = SCHED_RR;
- }
- if (gotPermission) {
- if (prio > 0 && prio < 100) {
- struct sched_param sch;
- bzero(&sch, sizeof(struct sched_param));
- sch.sched_priority = prio;
- pthread_setschedparam(thread->thread, policy, &sch);
- } else {
- logHelper_log(logHelper, OSGI_LOGSERVICE_INFO, "Skipping configuration
of thread prio to %i and thread scheduling to %s. No permission\n", (int) prio,
sched);
+ int policy = SCHED_OTHER;
+ if (strncmp("SCHED_OTHER", sched, 16) == 0) {
+ policy = SCHED_OTHER;
+ } else if (strncmp("SCHED_BATCH", sched, 16) == 0) {
+ policy = SCHED_BATCH;
+ } else if (strncmp("SCHED_IDLE", sched, 16) == 0) {
+ policy = SCHED_IDLE;
+ } else if (strncmp("SCHED_FIFO", sched, 16) == 0) {
+ policy = SCHED_FIFO;
+ } else if (strncmp("SCHED_RR", sched, 16) == 0) {
+ policy = SCHED_RR;
+ }
+ if (gotPermission) {
+ if (prio > 0 && prio < 100) {
+ struct sched_param sch;
+ bzero(&sch, sizeof(struct sched_param));
+ sch.sched_priority = prio;
+ pthread_setschedparam(thread->thread, policy, &sch);
+ } else {
+ logHelper_log(logHelper, OSGI_LOGSERVICE_INFO, "Skipping
configuration of thread prio to %i and thread scheduling to %s. No
permission\n", (int) prio, sched);
+ }
}
- }
}
}
diff --git a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_common.h
b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_common.h
index 4bf8eb5..09b5842 100644
--- a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_common.h
+++ b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_common.h
@@ -1,20 +1,20 @@
/**
- *Licensed to the Apache Software Foundation (ASF) under one
- *or more contributor license agreements. See the NOTICE file
- *distributed with this work for additional information
- *regarding copyright ownership. The ASF licenses this file
- *to you 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 to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- *Unless required by applicable law or agreed to in writing,
- *software distributed under the License is distributed on an
- *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- *specific language governing permissions and limitations
- *under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
#ifndef CELIX_PUBSUB_TCP_COMMON_H
@@ -31,8 +31,8 @@
typedef struct pubsub_tcp_endPointStore{
- celix_thread_mutex_t mutex;
- hash_map_t *map;
+ celix_thread_mutex_t mutex;
+ hash_map_t *map;
} pubsub_tcp_endPointStore_t;
/*
diff --git a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_handler.c
b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_handler.c
index 87fac38..a020c63 100644
--- a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_handler.c
+++ b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_handler.c
@@ -1,27 +1,27 @@
/**
- *Licensed to the Apache Software Foundation (ASF) under one
- *or more contributor license agreements. See the NOTICE file
- *distributed with this work for additional information
- *regarding copyright ownership. The ASF licenses this file
- *to you 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 to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- *Unless required by applicable law or agreed to in writing,
- *software distributed under the License is distributed on an
- *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- *specific language governing permissions and limitations
- *under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
/*
- * pubsub_tcp_socket_handler.c
+ * pubsub_tcp_handler.c
*
- * \date Mar 1, 2016
- * \author <a href="mailto:[email protected]";>Apache Celix
Project Team</a>
- * \copyright Apache License, Version 2.0
+ * \date July 18, 2019
+ * \author <a href="mailto:[email protected]";>Apache Celix Project
Team</a>
+ * \copyright Apache License, Version 2.0
*/
#include <stdio.h>
diff --git a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_handler.h
b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_handler.h
index f366875..235223e 100644
--- a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_handler.h
+++ b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_handler.h
@@ -1,27 +1,27 @@
/**
- *Licensed to the Apache Software Foundation (ASF) under one
- *or more contributor license agreements. See the NOTICE file
- *distributed with this work for additional information
- *regarding copyright ownership. The ASF licenses this file
- *to you 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 to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- *Unless required by applicable law or agreed to in writing,
- *software distributed under the License is distributed on an
- *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- *specific language governing permissions and limitations
- *under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
/*
- * pubsub_tcp_buffer_handler.h
+ * pubsub_tcp_handler.h
*
- * \date Mar 1, 2016
- * \author <a href="mailto:[email protected]";>Apache Celix
Project Team</a>
- * \copyright Apache License, Version 2.0
+ * \date July 18, 2016
+ * \author <a href="mailto:[email protected]";>Apache Celix Project
Team</a>
+ * \copyright Apache License, Version 2.0
*/
#ifndef _PUBSUB_TCP_BUFFER_HANDLER_H_
@@ -37,10 +37,10 @@
typedef struct pubsub_tcpHandler_url {
- char *url;
- char *protocol;
- char *hostname;
- unsigned int portnr;
+ char *url;
+ char *protocol;
+ char *hostname;
+ unsigned int portnr;
} pubsub_tcpHandler_url_t;
typedef struct pubsub_tcpHandler pubsub_tcpHandler_t;
diff --git a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_msg_header.h
b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_msg_header.h
index 35c423c..b515a10 100644
--- a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_msg_header.h
+++ b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_msg_header.h
@@ -1,33 +1,33 @@
/**
- *Licensed to the Apache Software Foundation (ASF) under one
- *or more contributor license agreements. See the NOTICE file
- *distributed with this work for additional information
- *regarding copyright ownership. The ASF licenses this file
- *to you 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 to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- *Unless required by applicable law or agreed to in writing,
- *software distributed under the License is distributed on an
- *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- *specific language governing permissions and limitations
- *under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
#ifndef PUBSUB_PSA_TCP_MSG_HEADER_H_
#define PUBSUB_PSA_TCP_MSG_HEADER_H_
typedef struct pubsub_tcp_msg_header {
- uint32_t type; //msg type id (hash of fqn)
- uint32_t seqNr;
- uint8_t major;
- uint8_t minor;
- unsigned char originUUID[16];
- uint64_t sendtimeSeconds; //seconds since epoch
- uint64_t sendTimeNanoseconds; //ns since epoch
+ uint32_t type; //msg type id (hash of fqn)
+ uint32_t seqNr;
+ uint8_t major;
+ uint8_t minor;
+ unsigned char originUUID[16];
+ uint64_t sendtimeSeconds; //seconds since epoch
+ uint64_t sendTimeNanoseconds; //ns since epoch
} pubsub_tcp_msg_header_t;
typedef struct pubsub_tcp_msg_header *pubsub_tcp_msg_header_pt;
diff --git a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_receiver.c
b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_receiver.c
index 2055052..5533331 100644
--- a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_receiver.c
+++ b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_receiver.c
@@ -1,20 +1,20 @@
/**
- *Licensed to the Apache Software Foundation (ASF) under one
- *or more contributor license agreements. See the NOTICE file
- *distributed with this work for additional information
- *regarding copyright ownership. The ASF licenses this file
- *to you 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 to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- *Unless required by applicable law or agreed to in writing,
- *software distributed under the License is distributed on an
- *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- *specific language governing permissions and limitations
- *under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
#include <pubsub_serializer.h>
diff --git a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_receiver.h
b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_receiver.h
index e9fb8a2..b7ac279 100644
--- a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_receiver.h
+++ b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_receiver.h
@@ -1,21 +1,22 @@
/**
- *Licensed to the Apache Software Foundation (ASF) under one
- *or more contributor license agreements. See the NOTICE file
- *distributed with this work for additional information
- *regarding copyright ownership. The ASF licenses this file
- *to you 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 to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- *Unless required by applicable law or agreed to in writing,
- *software distributed under the License is distributed on an
- *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- *specific language governing permissions and limitations
- *under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
+
#ifndef CELIX_PUBSUB_TCP_TOPIC_RECEIVER_H
#define CELIX_PUBSUB_TCP_TOPIC_RECEIVER_H
diff --git a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c
b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c
index 3cb9844..607508c 100644
--- a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c
+++ b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c
@@ -1,20 +1,20 @@
/**
- *Licensed to the Apache Software Foundation (ASF) under one
- *or more contributor license agreements. See the NOTICE file
- *distributed with this work for additional information
- *regarding copyright ownership. The ASF licenses this file
- *to you 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 to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- *Unless required by applicable law or agreed to in writing,
- *software distributed under the License is distributed on an
- *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- *specific language governing permissions and limitations
- *under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
#include <pubsub_serializer.h>
diff --git a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_sender.h
b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_sender.h
index 7f298fd..355195e 100644
--- a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_sender.h
+++ b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_sender.h
@@ -1,21 +1,22 @@
/**
- *Licensed to the Apache Software Foundation (ASF) under one
- *or more contributor license agreements. See the NOTICE file
- *distributed with this work for additional information
- *regarding copyright ownership. The ASF licenses this file
- *to you 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 to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- *Unless required by applicable law or agreed to in writing,
- *software distributed under the License is distributed on an
- *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- *specific language governing permissions and limitations
- *under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
+
#ifndef CELIX_PUBSUB_TCP_TOPIC_SENDER_H
#define CELIX_PUBSUB_TCP_TOPIC_SENDER_H
