experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cicd test fixes for libevhtp and warnings

Browse source
This commit is contained in:
Olof hagsand 2021-04-01 11:20:48 +02:00
parent 61c1db72ab
commit 0020c7ff3f
4 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/restconf/restconf_lib.c
View file

@ -606,7 +606,7 @@ restconf_config_init(clicon_handle h,
cxobj *x; cxobj *x;
char *bstr; char *bstr;
cvec *nsc = NULL; cvec *nsc = NULL;
clixon_auth_type_t auth_type; int auth_type;
if ((x = xpath_first(xrestconf, nsc, "enable")) != NULL && if ((x = xpath_first(xrestconf, nsc, "enable")) != NULL &&
(enable = xml_body(x)) != NULL){ (enable = xml_body(x)) != NULL){

6
apps/restconf/restconf_main_evhtp.c
View file

@ -821,7 +821,7 @@ restconf_connection(int s,
{ {
int retval = -1; int retval = -1;
evhtp_connection_t *conn = NULL; evhtp_connection_t *conn = NULL;
size_t n; ssize_t n;
char buf[1024]; char buf[1024];
SSL *ssl; SSL *ssl;
clicon_handle h; clicon_handle h;
@ -864,7 +864,7 @@ restconf_connection(int s,
clicon_debug(1, "%s connection_parse error", __FUNCTION__); clicon_debug(1, "%s connection_parse error", __FUNCTION__);
if (accept_badrequest(h, s, conn->ssl) < 0) if (accept_badrequest(h, s, conn->ssl) < 0)
goto done; goto done;
SSL_free(ssl); SSL_free(conn->ssl);
if (close_openssl_socket(s, NULL) < 0) if (close_openssl_socket(s, NULL) < 0)
goto done; goto done;
conn->ssl = NULL; conn->ssl = NULL;
@ -1085,7 +1085,9 @@ restconf_accept_client(int fd,
case SSL_ERROR_WANT_X509_LOOKUP: /* 4 */ case SSL_ERROR_WANT_X509_LOOKUP: /* 4 */
case SSL_ERROR_WANT_ASYNC: /* 8 */ case SSL_ERROR_WANT_ASYNC: /* 8 */
case SSL_ERROR_WANT_ASYNC_JOB: /* 10 */ case SSL_ERROR_WANT_ASYNC_JOB: /* 10 */
#ifdef SSL_ERROR_WANT_CLIENT_HELLO_CB
case SSL_ERROR_WANT_CLIENT_HELLO_CB: /* 11 */ case SSL_ERROR_WANT_CLIENT_HELLO_CB: /* 11 */
#endif
break; break;
} }
clicon_err(OE_SSL, 0, "SSL_accept:%d", e); clicon_err(OE_SSL, 0, "SSL_accept:%d", e);

13
lib/src/clixon_xml_io.c
View file

@ -554,19 +554,6 @@ _xml_parse(const char *str,
goto done; goto done;
} }
/*! FSM to detect substring
*/
static inline int
FSM(char *tag,
char ch,
int state)
{
if (tag[state] == ch)
return state+1;
else
return 0;
}
/*! Read an XML definition from file and parse it into a parse-tree, advanced API /*! Read an XML definition from file and parse it into a parse-tree, advanced API
* *
* @param[in] fd A file descriptor containing the XML file (as ASCII characters) * @param[in] fd A file descriptor containing the XML file (as ASCII characters)

6
test/cicd/cicd.sh
View file

@ -42,6 +42,12 @@ ssh -t $h "test -d src/cligen || (cd src;git clone https://github.com/clicon/cli
ssh -t $h "(cd src/cligen;git pull origin master)" ssh -t $h "(cd src/cligen;git pull origin master)"
ssh -t $h "(cd src/cligen;./configure)" ssh -t $h "(cd src/cligen;./configure)"
ssh -t $h "(cd src/cligen; /tmp/cligen-mk.sh)" ssh -t $h "(cd src/cligen; /tmp/cligen-mk.sh)"
# pull git changes and build clixon-libevhtp
ssh -t $h "test -d src || mkdir src"
ssh -t $h "test -d src/clixon-libevhtp || (cd src;git clone https://github.com/clicon/clixon-libevhtp.git)"
ssh -t $h "(cd src/clixon-libevhtp;git pull origin master)"
ssh -t $h "(cd src/clixon-libevhtp;./configure)"
ssh -t $h "(cd src/clixon-libevhtp; /tmp/cligen-mk.sh)" # re-use cligen
# pull git changes and build clixon # pull git changes and build clixon
ssh -t $h "test -d src/clixon || (cd src;git clone https://github.com/clicon/clixon.git)" ssh -t $h "test -d src/clixon || (cd src;git clone https://github.com/clicon/clixon.git)"
ssh -t $h "(cd src/clixon;git pull origin master)" ssh -t $h "(cd src/clixon;git pull origin master)"