Merge pull request #8 from jh1979-park/receiver2
author박정훈/Tizen Platform Lab(SR)/Senior Engineer/삼성전자 <jh1979.park@samsung.com>
Thu, 18 Jan 2018 01:58:55 +0000 (10:58 +0900)
committerGitHub Enterprise <noreply-CODE@samsung.com>
Thu, 18 Jan 2018 01:58:55 +0000 (10:58 +0900)
refines receiver and receiver udp module

inc/connection_manager.h [new file with mode: 0644]
inc/resource.h
inc/resource/resource_motor_driver_L298N_internal.h
inc/resource_internal.h
src/connection_manager.c [new file with mode: 0644]
src/resource.c

diff --git a/inc/connection_manager.h b/inc/connection_manager.h
new file mode 100644 (file)
index 0000000..14a054f
--- /dev/null
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Flora License, Version 1.1 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://floralicense.org/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 __POSITION_FINDER_CONN_MGR_H__
+#define __POSITION_FINDER_CONN_MGR_H__
+
+typedef enum {
+       CONNECTION_STATE_DISCONNECTED,
+       CONNECTION_STATE_CONNECTED,
+} connection_state_e;
+
+typedef void(*connection_state_changed_cb)
+       (connection_state_e state, const char *ip, void* user_data);
+
+int connection_manager_get_ip(const char **ip);
+int connection_manager_init(void);
+int connection_manager_fini(void);
+int connection_manager_set_state_changed_cb(
+       connection_state_changed_cb state_cb, void *user_data);
+
+#endif /* __POSITION_FINDER_CONN_MGR_H__ */
index 49719c1..5aacc4a 100644 (file)
@@ -26,4 +26,6 @@
 #include "resource/resource_motor_driver_L298N.h"
 #include "resource/resource_servo_motor.h"
 
+void resource_close_all(void);
+
 #endif /* __POSITION_FINDER_RESOURCE_H__ */
index fa5beb1..2fb63f7 100644 (file)
@@ -19,6 +19,8 @@
 #ifndef __RESOURCE_MOTOR_DRIVER_L298N_INTERNAL_H__
 #define __RESOURCE_MOTOR_DRIVER_L298N_INTERNAL_H__
 
+#include "resource/resource_motor_driver_L298N.h"
+
 void resource_close_motor_driver_L298N(motor_id_e id);
 void resource_close_motor_driver_L298N_all(void);
 
index 12e318c..fb18904 100644 (file)
@@ -48,6 +48,5 @@ typedef struct _resource_s {
 } resource_s;
 
 extern resource_s *resource_get_info(int pin_num);
-extern void resource_close_all(void);
 
 #endif /* __POSITION_FINDER_RESOURCE_INTERNAL_H__ */
diff --git a/src/connection_manager.c b/src/connection_manager.c
new file mode 100644 (file)
index 0000000..2ed6d1b
--- /dev/null
@@ -0,0 +1,237 @@
+/*
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Flora License, Version 1.1 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://floralicense.org/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 <net_connection.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "log.h"
+#include "connection_manager.h"
+
+struct conn_mgr_s {
+       connection_h connection;
+       connection_type_e net_state;
+       connection_wifi_state_e wifi_state;
+       char *ip_addr;
+       connection_state_changed_cb state_cb;
+       void *state_cb_data;
+};
+
+struct conn_mgr_s conn_mgr = {
+       NULL,
+       CONNECTION_TYPE_DISCONNECTED,
+       CONNECTION_WIFI_STATE_DEACTIVATED,
+       NULL,
+       NULL,
+       NULL
+};
+
+static const char *__connection_error_to_string(connection_error_e error)
+{
+       switch (error) {
+       case CONNECTION_ERROR_NONE:
+               return "CONNECTION_ERROR_NONE";
+       case CONNECTION_ERROR_INVALID_PARAMETER:
+               return "CONNECTION_ERROR_INVALID_PARAMETER";
+       case CONNECTION_ERROR_OUT_OF_MEMORY:
+               return "CONNECTION_ERROR_OUT_OF_MEMORY";
+       case CONNECTION_ERROR_INVALID_OPERATION:
+               return "CONNECTION_ERROR_INVALID_OPERATION";
+       case CONNECTION_ERROR_ADDRESS_FAMILY_NOT_SUPPORTED:
+               return "CONNECTION_ERROR_ADDRESS_FAMILY_NOT_SUPPORTED";
+       case CONNECTION_ERROR_OPERATION_FAILED:
+               return "CONNECTION_ERROR_OPERATION_FAILED";
+       case CONNECTION_ERROR_ITERATOR_END:
+               return "CONNECTION_ERROR_ITERATOR_END";
+       case CONNECTION_ERROR_NO_CONNECTION:
+               return "CONNECTION_ERROR_NO_CONNECTION";
+       case CONNECTION_ERROR_NOW_IN_PROGRESS:
+               return "CONNECTION_ERROR_NOW_IN_PROGRESS";
+       case CONNECTION_ERROR_ALREADY_EXISTS:
+               return "CONNECTION_ERROR_ALREADY_EXISTS";
+       case CONNECTION_ERROR_OPERATION_ABORTED:
+               return "CONNECTION_ERROR_OPERATION_ABORTED";
+       case CONNECTION_ERROR_DHCP_FAILED:
+               return "CONNECTION_ERROR_DHCP_FAILED";
+       case CONNECTION_ERROR_INVALID_KEY:
+               return "CONNECTION_ERROR_INVALID_KEY";
+       case CONNECTION_ERROR_NO_REPLY:
+               return "CONNECTION_ERROR_NO_REPLY";
+       case CONNECTION_ERROR_PERMISSION_DENIED:
+               return "CONNECTION_ERROR_PERMISSION_DENIED";
+       case CONNECTION_ERROR_NOT_SUPPORTED:
+               return "CONNECTION_ERROR_NOT_SUPPORTED";
+       default:
+               return "CONNECTION_ERROR_UNKNOWN";
+       }
+}
+
+static void __conn_mgr_connection_changed_cb(connection_type_e type,
+        void* user_data)
+{
+       int ret = CONNECTION_ERROR_NONE;
+       connection_state_e state = CONNECTION_STATE_DISCONNECTED;
+       _D("connection changed from[%d] to[%d]", conn_mgr.net_state, type);
+
+       conn_mgr.net_state = type;
+
+       ret = connection_get_wifi_state(conn_mgr.connection,
+               &conn_mgr.wifi_state);
+
+       if (CONNECTION_ERROR_NONE != ret)
+               _E("failed to connection_get_wifi_state - [%s]",
+                       __connection_error_to_string(ret));
+
+       free(conn_mgr.ip_addr);
+       conn_mgr.ip_addr = NULL;
+
+       if (conn_mgr.net_state != CONNECTION_TYPE_DISCONNECTED) {
+               state = CONNECTION_STATE_CONNECTED;
+               ret = connection_get_ip_address(conn_mgr.connection,
+                               CONNECTION_ADDRESS_FAMILY_IPV4, &conn_mgr.ip_addr);
+
+               if ((CONNECTION_ERROR_NONE != ret) || (conn_mgr.ip_addr == NULL))
+                       _E("failed to connection_get_ip_address() - [%s]",
+                               __connection_error_to_string(ret));
+       }
+
+       if (conn_mgr.state_cb)
+               conn_mgr.state_cb(state, conn_mgr.ip_addr, conn_mgr.state_cb_data);
+
+       return;
+}
+
+int connection_manager_get_ip(const char **ip)
+{
+       int ret = CONNECTION_ERROR_NONE;
+
+       retv_if(conn_mgr.connection == NULL, -1);
+       retv_if(ip == NULL, -1);
+
+       if (conn_mgr.ip_addr) {
+               *ip = conn_mgr.ip_addr;
+               return 0;
+       }
+
+       if (conn_mgr.net_state == CONNECTION_TYPE_DISCONNECTED) {
+               _W("disconnected now");
+
+               free(conn_mgr.ip_addr);
+               conn_mgr.ip_addr = NULL;
+
+               return -1;
+       }
+
+       ret = connection_get_ip_address(conn_mgr.connection,
+                       CONNECTION_ADDRESS_FAMILY_IPV4, &conn_mgr.ip_addr);
+
+       if ((CONNECTION_ERROR_NONE != ret) || (conn_mgr.ip_addr == NULL)) {
+               _E("failed to connection_get_ip_address() - [%s]",
+                       __connection_error_to_string(ret));
+               return -1;
+       }
+
+       *ip = conn_mgr.ip_addr;
+
+       return 0;
+}
+
+int connection_manager_init(void)
+{
+       int ret = CONNECTION_ERROR_NONE;
+       if (conn_mgr.connection) {
+               _W("connection manager is already initialized");
+               return 0;
+       }
+
+       ret = connection_create(&conn_mgr.connection);
+       if (CONNECTION_ERROR_NONE != ret) {
+               _E("failed to create connection - [%s]",
+                       __connection_error_to_string(ret));
+               return -1;
+       }
+
+       ret = connection_get_type(conn_mgr.connection, &conn_mgr.net_state);
+       if (CONNECTION_ERROR_NONE != ret) {
+               _E("failed to connection_get_type - [%s]",
+                       __connection_error_to_string(ret));
+       }
+
+       if (conn_mgr.net_state != CONNECTION_TYPE_DISCONNECTED) {
+               ret = connection_get_ip_address(conn_mgr.connection,
+                       CONNECTION_ADDRESS_FAMILY_IPV4, &conn_mgr.ip_addr);
+               if ((CONNECTION_ERROR_NONE != ret) || (conn_mgr.ip_addr == NULL))
+                       _E("failed to connection_get_ip_address() - [%s]",
+                               __connection_error_to_string(ret));
+       }
+
+       ret = connection_get_wifi_state(conn_mgr.connection, &conn_mgr.wifi_state);
+       if (CONNECTION_ERROR_NONE != ret)
+               _E("failed to connection_get_wifi_state - [%s]",
+                       __connection_error_to_string(ret));
+
+       _D("net_state[%d], wifi_state[%d], ip address[%s]",
+               conn_mgr.net_state, conn_mgr.wifi_state, conn_mgr.ip_addr);
+
+       ret = connection_set_type_changed_cb(conn_mgr.connection,
+                       __conn_mgr_connection_changed_cb, &conn_mgr);
+       if (CONNECTION_ERROR_NONE != ret)
+               _E("failed to connection_set_type_changed_cb - [%s]",
+                       __connection_error_to_string(ret));
+
+       return 0;
+}
+
+int connection_manager_fini(void)
+{
+       if (conn_mgr.connection) {
+               int ret = 0;
+               ret = connection_destroy(conn_mgr.connection);
+               _D("connection_destroy - [%s]", __connection_error_to_string(ret));
+       }
+
+       conn_mgr.net_state = CONNECTION_TYPE_DISCONNECTED;
+       conn_mgr.wifi_state = CONNECTION_WIFI_STATE_DEACTIVATED;
+
+       if (conn_mgr.ip_addr) {
+               free(conn_mgr.ip_addr);
+               conn_mgr.ip_addr = NULL;
+       }
+
+       conn_mgr.state_cb = NULL;
+       conn_mgr.state_cb_data = NULL;
+
+       return 0;
+}
+
+int connection_manager_set_state_changed_cb(
+       connection_state_changed_cb state_cb, void *user_data)
+{
+       conn_mgr.state_cb = state_cb;
+
+       if (state_cb) {
+               connection_state_e state = CONNECTION_STATE_DISCONNECTED;
+
+               conn_mgr.state_cb_data = user_data;
+               if (conn_mgr.net_state != CONNECTION_TYPE_DISCONNECTED)
+                       state = CONNECTION_STATE_CONNECTED;
+
+               conn_mgr.state_cb(state, conn_mgr.ip_addr, conn_mgr.state_cb_data);
+       } else
+               conn_mgr.state_cb_data = NULL;
+
+       return 0;
+}
index d16c5be..a27b0fa 100644 (file)
@@ -23,6 +23,8 @@
 
 #include "log.h"
 #include "resource_internal.h"
+#include "resource/resource_motor_driver_L298N_internal.h"
+#include "resource/resource_servo_motor_internal.h"
 
 static resource_s resource_info[PIN_MAX] = { {0, NULL, NULL}, };