[Feature][T108][task-view-1550] GSW base code update v1453 --1 <merged ext_at>
Only Configure: No
Affected branch: GSW_V1453
Affected module: ALL
Is it affected on IC: only ASR
Self-test: yes
Doc Update: no
Change-Id: Ib5f6a29af49ec9deb3e7a95c78331fddc8290f28
diff --git a/marvell/lte-telephony/apps/atcmd_server_ss/src/telcontroller.c b/marvell/lte-telephony/apps/atcmd_server_ss/src/telcontroller.c
index 435642f..2893280 100644
--- a/marvell/lte-telephony/apps/atcmd_server_ss/src/telcontroller.c
+++ b/marvell/lte-telephony/apps/atcmd_server_ss/src/telcontroller.c
@@ -3530,6 +3530,312 @@
};
pthread_mutex_t gTimeoutTableLock = PTHREAD_MUTEX_INITIALIZER;
+#ifdef MBTK_AT_SUPPORT
+
+#define EXT_SOCKET_NAME "/tmp/atcmdext" //LYNQ_MODFIY for gsw ext_at
+//LYNQ_MODFIY_START for gsw ext_at
+#define SOCKET_ZERO 0
+#define SOCKET_SUCC 1
+#define SOCKET_FAIL -1
+#define SOCKET_BUF_SIZE 512
+TelAtParserID extID;
+char register_atcmd_buff[SOCKET_BUF_SIZE] = {0};
+char *white_list[] = {"AT","ATD","ATV","ATA","ATE","ATH","ATL","ATI","ATP","ATO","ATQ",NULL};
+int g_atsvc_socket_fd = 0;
+int g_atsvc_client_connect = -1;
+static pthread_mutex_t s_startupMutex = PTHREAD_MUTEX_INITIALIZER;
+int has_registe_cmd = 0;
+int g_create_socket = 0;
+struct sockaddr_un g_remote_addr = {0};
+struct sockaddr_un g_local_addr = {0};
+
+void upper_string(char *org_string)
+{
+ int len = strlen(org_string);
+ for(int i=0;i<len;i++)
+ {
+ if(org_string[i]>=97 && org_string[i]<=122)
+ {
+ org_string[i]=org_string[i]-32;
+ }
+ }
+ return;
+}
+
+char* cut_cmd_line(char* line)
+{
+ char* result;
+ int i = 0;
+ int size = strlen(line);
+ int len = size;
+ for (i = 0; i < size; i++) {
+ if (line[i] == '=' || line[i] == '?') {
+ len = i;
+ break;
+ }
+ }
+ result = (char*)malloc((len + 1) * sizeof(char));
+ if (result == NULL) {
+ ERRMSG(cut_cmd_line, "malloc result fail, return NULL");
+ return NULL;
+ }
+ memcpy(result, line, len);
+ while (len > 0 && (result[len - 1] == '\r' || result[len - 1] == '\n'))
+ {
+ result[--len] = '\0';
+ }
+ DBGMSG(cut_cmd_line, "cut_cmd_line is:%s,len:%d", result,len);
+ return result;
+}
+
+int actsvc_cmd_recv(int fd, char *buf, int len)
+{
+ int ret = 0;
+ ret = recv(fd, buf, len, 0);
+ DBGMSG(actsvc_cmd_recv, "%s: mbtk_lib_init() failed\n", __FUNCTION__);
+ if (ret < 0)
+ {
+ ERRMSG(actsvc_cmd_recv, "acti_cmd_recv service select error, ret=%d, error=%s(%d),fd=%d", ret,strerror(errno), errno, fd);
+ return SOCKET_FAIL;
+ }
+ else if(ret == 0)
+ {
+ ERRMSG(actsvc_cmd_recv, "acti_cmd_recv service recv error, ret=%d, error=%s(%d),fd=%d", ret,strerror(errno), errno, fd);
+ return SOCKET_ZERO;
+ }
+ else
+ {
+ ERRMSG(actsvc_cmd_recv, "[%s] buf is:%s",__FUNCTION__,buf);
+ return SOCKET_SUCC;
+ }
+}
+
+int create_socket(const int domain, const int type, const int protocol,const int port,const char *IP,const char *socket_name,void * addr,int backlog)
+{
+ DBGMSG(create_socket,"domain:%d,type:%d,protocol:%d,port:%d,IP:%s,socket_name:%s,backlog:%d",domain,type,protocol,port,IP,socket_name,backlog);
+ int socket_fd = -1;
+ char acBuf[1024] = {0};
+ struct sockaddr_un *local_addr = NULL;
+ local_addr = (struct sockaddr_un *)addr;
+ socket_fd = socket(domain, type,protocol);
+ if(0 > socket_fd)
+ {
+ ERRMSG(create_socket,"create socket fail:fd = %d",socket_fd);
+ return socket_fd;
+ }
+ switch (domain)
+ {
+ case AF_UNIX:
+ {
+ if (strlen(socket_name) > sizeof(local_addr->sun_path) - 1)
+ {
+ ERRMSG(create_socket,"Server socket path too long: %s", socket_name);
+ return (-strlen(socket_name));
+ }
+ if (remove(socket_name) == -1 && errno != ENOENT)
+ {
+ ERRMSG(create_socket,"remove-%s fail and errno:%d", socket_name,errno);
+ }
+ while(access(socket_name, R_OK)==0)
+ {
+ ERRMSG(create_socket,"%s still exist", socket_name);
+ usleep(10);
+ }
+ ERRMSG(create_socket,"remove %s", socket_name);
+ local_addr->sun_family = AF_UNIX;
+ strncpy(local_addr->sun_path, socket_name, sizeof(local_addr->sun_path) - 1);
+ local_addr->sun_path[sizeof(local_addr->sun_path) - 1] = '\0';
+ if(bind(socket_fd, (struct sockaddr *)local_addr, sizeof(struct sockaddr_un)) < 0)
+ {
+ ERRMSG(create_socket,"bind failed name=[%s] reason=[%s]\n", socket_name, strerror(errno));
+ close(g_atsvc_socket_fd);
+ return -1;
+ }
+ if(type == SOCK_STREAM)
+ {
+ if(listen(socket_fd,backlog) == -1)
+ {
+ ERRMSG(create_socket,"listen fd: %dfail",socket_fd);
+ close(g_atsvc_socket_fd);
+ return -1;
+ }
+ }
+ break;
+ }
+ case AF_INET:
+ {
+ break;
+ }
+ default:
+ break;
+ }
+ return socket_fd;
+}
+
+int mbtk_check_extension_atcmd(char * atcmd)
+{
+ DBGMSG(mbtk_check_extension_atcmd, "[%s] enter",__FUNCTION__);
+ char *needleP = NULL;
+ if(NULL == atcmd || strlen(atcmd) < 2)
+ {
+ ERRMSG(mbtk_check_extension_atcmd, "[%s] atcmd is null",__FUNCTION__);
+ return -1;
+ }
+ DBGMSG(mbtk_check_extension_atcmd, "[%s]atcmd:%s",__FUNCTION__,atcmd);
+ char* line_cut = cut_cmd_line(atcmd);
+ if (line_cut == NULL)
+ {
+ ERRMSG(mbtk_check_extension_atcmd, "[%s]line_cut is null",__FUNCTION__);
+ return -1;
+ }
+ for(int i = 0;white_list[i];i++)
+ {
+ if(strcmp(line_cut,white_list[i]) == 0)
+ {
+ ERRMSG(mbtk_check_extension_atcmd, "[%s]count %d,pass atcmd:%s",__FUNCTION__,i,line_cut);
+ return -1;
+ }
+ }
+ needleP =strstr(register_atcmd_buff,line_cut);
+ if(NULL != needleP)
+ {
+ ERRMSG(mbtk_check_extension_atcmd, "[%s] find atcmd:%s",__FUNCTION__,line_cut);
+ free(line_cut);
+ return 0;
+ }
+ free(line_cut);
+ return -1;
+}
+int send_msg_to_at_extension(char *atcmd,int size)
+{
+ DBGMSG(send_msg_to_at_extension, "[%s] enter",__FUNCTION__);
+ if (g_atsvc_client_connect < 0)
+ {
+ ERRMSG(send_msg_to_at_extension, "fd invalid when send to atci service. errno = %d", errno);
+ return -1;
+ }
+ if(NULL == atcmd)
+ {
+ ERRMSG(send_msg_to_at_extension, "atcmd is null.");
+ return -1;
+ }
+
+ int sendLen = send(g_atsvc_client_connect, atcmd, size, 0);
+ if (sendLen != size)
+ {
+ ERRMSG(send_msg_to_at_extension, "lose data when send to atci service. errno = %d", errno);
+ return -1;
+ }
+ DBGMSG(send_msg_to_at_extension, "service send to app demo: %s", atcmd);
+ return 0;
+}
+
+void *start_at_extension_Socket()
+{
+ DBGMSG(start_at_extension_Socket, "[%s]enter",__FUNCTION__);
+ socklen_t client_len;
+ int ret;
+ char parser_buf[SOCKET_BUF_SIZE];
+ TryNewSocket:
+ g_atsvc_socket_fd = create_socket(AF_UNIX, SOCK_STREAM,0, 0, NULL,EXT_SOCKET_NAME, (void *)&g_local_addr, 2);
+ if(0 > g_atsvc_socket_fd)
+ {
+ ERRMSG(start_at_extension_Socket, "init socket fail and fd:%d",g_atsvc_socket_fd);
+ g_create_socket++;
+ if(g_create_socket == 10)
+ {
+ ERRMSG(start_at_extension_Socket, "create_socket max try count is %d\n", g_create_socket);
+ return NULL;
+ }
+ else
+ {
+ ERRMSG(start_at_extension_Socket, "create_socket try again %d\n", g_create_socket);
+ usleep(500*1000);
+ goto TryNewSocket;
+ }
+ }
+ g_create_socket = 0;
+ TryNewLink:
+ DBGMSG(start_at_extension_Socket, "[%s] TryNewLink!",__FUNCTION__);
+ client_len = sizeof(g_local_addr);
+ int conn = accept(g_atsvc_socket_fd,(struct sockaddr *) &g_local_addr, &client_len);
+ if (conn <= 0)
+ {
+ ERRMSG(start_at_extension_Socket, "[%s] accept error!",__FUNCTION__);
+ close(conn);
+ return NULL;
+ }
+ DBGMSG(start_at_extension_Socket, "Accept a client , fd is %d", conn);
+ if(g_atsvc_client_connect >= 0)
+ {
+ ERRMSG(start_at_extension_Socket, "g_atsvc_client_connect need close!");
+ close(g_atsvc_client_connect);
+ }
+ g_atsvc_client_connect = conn;
+ /* tranlate data */
+ while (true)
+ {
+ memset(parser_buf, 0, sizeof(parser_buf));
+ if(has_registe_cmd == 0)
+ {
+ memset(register_atcmd_buff, 0, sizeof(register_atcmd_buff));
+ ret = actsvc_cmd_recv(conn, register_atcmd_buff, SOCKET_BUF_SIZE);
+ upper_string(register_atcmd_buff);
+ DBGMSG(start_at_extension_Socket, "[%s] ret %d has_registe_cmd %d",__FUNCTION__,ret,has_registe_cmd);
+ if (ret < 0)
+ {
+ ERRMSG(start_at_extension_Socket, "[%s]receive CMD error",__FUNCTION__);
+ continue;
+ }
+ else if(ret == SOCKET_ZERO)
+ {
+ ERRMSG(start_at_extension_Socket, "maybe client socket closed 1. retry new link!");
+ goto TryNewLink;
+ }
+ has_registe_cmd = 1;
+ }
+ else
+ {
+ ret = actsvc_cmd_recv(conn, parser_buf, SOCKET_BUF_SIZE);
+ DBGMSG(start_at_extension_Socket, "[%s] ret %d has_registe_cmd %d",__FUNCTION__,ret,has_registe_cmd);
+ if (ret < 0)
+ {
+ ERRMSG(start_at_extension_Socket, "[%s]receive CMD error",__FUNCTION__);
+ continue;
+ }
+ else if(ret == SOCKET_ZERO)
+ {
+ ERRMSG(start_at_extension_Socket, "maybe client socket closed 1. retry new link!");
+ goto TryNewLink;
+ }
+ UINT32 atHandle = MAKE_AT_HANDLE(extID);
+ ATRESP(atHandle,0,0,parser_buf);
+ }
+ }
+ return NULL;
+}
+
+void start_at_extension_loop(void)
+{
+ pthread_t at_extension_socket_thread;
+ DBGMSG(start_at_extension_loop, "[%s]enter",__FUNCTION__);
+ pthread_mutex_lock(&s_startupMutex);
+
+ pthread_attr_t attr;
+ pthread_attr_init(&attr);
+ pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+
+ int result = pthread_create(&at_extension_socket_thread, &attr, start_at_extension_Socket, NULL);
+ if (result != 0)
+ {
+ ERRMSG(start_at_extension_loop, "Failed to create ATCI thread: %s", strerror(result));
+ goto done;
+ }
+done:
+ pthread_mutex_unlock(&s_startupMutex);
+}
+//LYNQ_MODFIY_END for gsw ext_at
+#endif
/*------------------------------------------------------------------------------*/
@@ -3898,6 +4204,23 @@
#endif
writeATcmd2file(buffer);
ERRMSG(ProcessAtChanThread8, "[ProcessAtChanThread](length=%d):%s\n", received, buffer);
+#ifdef MBTK_AT_SUPPORT
+//LYNQ_MODFIY_START for gsw ext_at
+ extID = sAtpIndex;
+ if(mbtk_check_extension_atcmd(buffer) == 0)
+ {
+ if(send_msg_to_at_extension(buffer,strlen(buffer))!=0)
+ {
+ ERRMSG(ProcessAtChanThread60, "send at fail,please try agin");
+ }
+ continue;
+ }
+ else
+ {
+ ERRMSG(ProcessAtChanThread60, "mbtk_check_extension_atcmd fail\n");
+ }
+//LYNQ_MODFIY_END for gsw ext_at
+#endif
ret = utlAtParse(aParser_p[sAtpIndex], (unsigned char *)buffer, received);
if(utlSUCCESS != ret)
{