From ac09bf8f4d1b4e71828199772a76538931a6c72d Mon Sep 17 00:00:00 2001 From: toni Date: Mon, 4 Jan 2016 11:23:09 +0100 Subject: added ipc check binary --- src/check/check.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 src/check/check.c (limited to 'src/check/check.c') diff --git a/src/check/check.c b/src/check/check.c new file mode 100644 index 0000000..bbc22eb --- /dev/null +++ b/src/check/check.c @@ -0,0 +1,55 @@ +#include +#include +#include +#include +#include +#include +#include + +#define myassert(x) if ((x)) { ret &= 0xFF; } else { ret &= 0x00; } + +static volatile unsigned char ret = 0xFF; +static mqd_t mq_test; +static mqd_t mq_recv; +static const size_t bufsiz = 256; + +int main(int argc, char **argv) +{ + int c_stat; + struct mq_attr m_attr; + char buf[bufsiz], recv[bufsiz]; + unsigned int prio; + ssize_t sz_recv; + + memset(buf, '\0', bufsiz); + memset(recv, '\0', bufsiz); + if (argc > 1) + strncpy(buf, argv[1], bufsiz-1); + + m_attr.mq_flags = 0; + m_attr.mq_msgsize = bufsiz; + m_attr.mq_maxmsg = 10; + m_attr.mq_curmsgs = 0; + + mq_unlink("/testmq"); + myassert( (mq_test = mq_open( "/testmq", O_NONBLOCK | O_CREAT | O_EXCL | O_RDWR, S_IRWXU | S_IRWXG, &m_attr )) != (mqd_t)-1 ); + myassert( mq_getattr(mq_test, &m_attr) == 0 ); + + strcpy(buf, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVQXYZ"); + myassert( mq_send(mq_test, buf, bufsiz, 0) == 0 ); + myassert( (sz_recv = mq_receive(mq_test, recv, bufsiz, &prio)) > 0 ); + + memset(recv, '\0', bufsiz); + if (fork() > 0) { + myassert( (mq_recv = mq_open( "/testmq", O_RDONLY, S_IRWXU | S_IRWXG, &m_attr )) != (mqd_t)-1 ); + myassert( (sz_recv = mq_receive(mq_recv, recv, bufsiz, &prio)) > 0 ); + return ret; + } + myassert( mq_send(mq_test, buf, bufsiz, 0) == 0 ); + wait(&c_stat); + myassert( c_stat == 0xFF ); + myassert( mq_close(mq_test) == 0 ); + myassert( mq_unlink("/testmq") == 0 ); + + return ~ret; +} -- cgit v1.2.3 From ad31e73105e58079c2f4fe85b70b80cd7ae1c76a Mon Sep 17 00:00:00 2001 From: toni Date: Mon, 4 Jan 2016 13:29:11 +0100 Subject: blah --- .gitignore | 1 + scripts/naskpass.initscript | 2 +- src/check/check.c | 36 +++++++++++++++++++++++------------- src/log.c | 19 +++++++++++++++++++ src/log.h | 8 ++++++++ src/main.c | 14 +++++++++++--- src/opt.c | 3 +++ 7 files changed, 66 insertions(+), 17 deletions(-) create mode 100644 src/log.c create mode 100644 src/log.h (limited to 'src/check/check.c') diff --git a/.gitignore b/.gitignore index 61d8ae2..de07cbd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /naskpass +/naskpass_check /src/version.h /tests/producer /tests/producer_consumer diff --git a/scripts/naskpass.initscript b/scripts/naskpass.initscript index 21ced37..fa22318 100755 --- a/scripts/naskpass.initscript +++ b/scripts/naskpass.initscript @@ -311,7 +311,7 @@ setup_mapping() fi else dmesg -n 1 - if ! $cryptkeyscript -c "cryptsetup -T 1 open $cryptsource $crypttarget"; then + if ! $cryptkeyscript -c "/sbin/cryptsetup -T 1 open $cryptsource $crypttarget"; then message "naskpass: failed" continue else diff --git a/src/check/check.c b/src/check/check.c index bbc22eb..9d28129 100644 --- a/src/check/check.c +++ b/src/check/check.c @@ -4,13 +4,16 @@ #include #include #include +#include #include -#define myassert(x) if ((x)) { ret &= 0xFF; } else { ret &= 0x00; } -static volatile unsigned char ret = 0xFF; +#define myassert(x, emask) if ((x)) { ret &= ret; } else { ret |= emask; } + +static volatile unsigned long long int ret = 0x0; static mqd_t mq_test; static mqd_t mq_recv; +static sem_t *sp_test; static const size_t bufsiz = 256; int main(int argc, char **argv) @@ -32,24 +35,31 @@ int main(int argc, char **argv) m_attr.mq_curmsgs = 0; mq_unlink("/testmq"); - myassert( (mq_test = mq_open( "/testmq", O_NONBLOCK | O_CREAT | O_EXCL | O_RDWR, S_IRWXU | S_IRWXG, &m_attr )) != (mqd_t)-1 ); - myassert( mq_getattr(mq_test, &m_attr) == 0 ); + myassert( (mq_test = mq_open( "/testmq", O_NONBLOCK | O_CREAT | O_EXCL | O_RDWR, S_IRWXU | S_IRWXG, &m_attr )) != (mqd_t)-1, 0x1 ); + myassert( mq_getattr(mq_test, &m_attr) == 0, 0x2 ); strcpy(buf, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVQXYZ"); - myassert( mq_send(mq_test, buf, bufsiz, 0) == 0 ); - myassert( (sz_recv = mq_receive(mq_test, recv, bufsiz, &prio)) > 0 ); + myassert( mq_send(mq_test, buf, bufsiz, 0) == 0, 0x4 ); + myassert( (sz_recv = mq_receive(mq_test, recv, bufsiz, &prio)) > 0, 0x8 ); memset(recv, '\0', bufsiz); if (fork() > 0) { - myassert( (mq_recv = mq_open( "/testmq", O_RDONLY, S_IRWXU | S_IRWXG, &m_attr )) != (mqd_t)-1 ); - myassert( (sz_recv = mq_receive(mq_recv, recv, bufsiz, &prio)) > 0 ); + myassert( (mq_recv = mq_open( "/testmq", O_RDONLY, S_IRWXU | S_IRWXG, &m_attr )) != (mqd_t)-1, 0x10 ); + myassert( (sz_recv = mq_receive(mq_recv, recv, bufsiz, &prio)) > 0, 0x20 ); return ret; } - myassert( mq_send(mq_test, buf, bufsiz, 0) == 0 ); + myassert( mq_send(mq_test, buf, bufsiz, 0) == 0, 0x40 ); wait(&c_stat); - myassert( c_stat == 0xFF ); - myassert( mq_close(mq_test) == 0 ); - myassert( mq_unlink("/testmq") == 0 ); + myassert( c_stat == 0xFF, 0x80 ); + myassert( mq_close(mq_test) == 0, 0x100 ); + myassert( mq_unlink("/testmq") == 0, 0x200 ); + + myassert( sem_unlink("/testsem") == 0, 0x400 ); + myassert( (sp_test = sem_open("/testsem", O_CREAT | O_EXCL, S_IRUSR | S_IWUSR, 0)), 0x800 ); + myassert( sem_post(sp_test) == 0, 0x1000 ); + myassert( sem_wait(sp_test) == 0, 0x1200 ); + myassert( sem_close(sp_test) == 0, 0x1400 ); + myassert( sem_unlink("/testsem") == 0, 0x1800 ); - return ~ret; + return ret; } diff --git a/src/log.c b/src/log.c new file mode 100644 index 0000000..93d6532 --- /dev/null +++ b/src/log.c @@ -0,0 +1,19 @@ +#include +#include + +#include "log.h" + + +static int logfd; + +int log_init(char *file) +{ + logfd = fopen(file, "a+"); + return logfd; +} + +int logs(char *format, ...) +{ + +} + diff --git a/src/log.h b/src/log.h new file mode 100644 index 0000000..7b4affc --- /dev/null +++ b/src/log.h @@ -0,0 +1,8 @@ +#ifndef LOG_H +#define LOG_H 1 + +int log_init(char *file); + +int logs(char *format, ...); + +#endif diff --git a/src/main.c b/src/main.c index 31afd29..1065371 100644 --- a/src/main.c +++ b/src/main.c @@ -73,7 +73,7 @@ run_cryptcreate(char *pass, char *crypt_cmd) char *cmd; if (crypt_cmd == NULL || pass == NULL) return (-1); - asprintf(&cmd, "echo '%s' | %s >/dev/null 2>/dev/null", pass, crypt_cmd); + asprintf(&cmd, "echo '%s' | %s", pass, crypt_cmd); retval = system(cmd); free(cmd); return (retval); @@ -112,7 +112,12 @@ main(int argc, char **argv) } memset(pbuf, '\0', IPC_MQSIZ+1); - parse_cmd(argc, argv); + if ( parse_cmd(argc, argv) != 0 ) + goto error; + if (OPT(CRYPT_CMD).found == 0) { + usage(argv[0]); + goto error; + } if (check_fifo(GETOPT(FIFO_PATH).str) == false) { usage(argv[0]); goto error; @@ -164,7 +169,10 @@ main(int argc, char **argv) break; } } - wait(&c_status); + waitpid(child, &c_status, WNOHANG); + if ( WIFEXITED(c_status) == 0 ) { + wait(&c_status); + } memset(pbuf, '\0', IPC_MQSIZ+1); } else { /* fork error */ diff --git a/src/opt.c b/src/opt.c index 7b6d083..19d8879 100644 --- a/src/opt.c +++ b/src/opt.c @@ -39,6 +39,9 @@ parse_cmd(int argc, char **argv) case 'c': s_OPT(CRYPT_CMD, strdup(optarg)); break; + default: + usage(argv[0]); + return 1; } } return 0; -- cgit v1.2.3