author | Michael Krelin <hacker@klever.net> | 2011-03-19 17:25:00 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2011-03-19 17:52:04 (UTC) |
commit | 5ca0d6a85c438ea75dc2795aca5176e3b31e89f0 (patch) (unidiff) | |
tree | f35c09c1d07c2150d4d0a58a517b878a44591cc8 | |
parent | c295320edf2d733a12a622c5a721c8431800a68a (diff) | |
download | iii-5ca0d6a85c438ea75dc2795aca5176e3b31e89f0.zip iii-5ca0d6a85c438ea75dc2795aca5176e3b31e89f0.tar.gz iii-5ca0d6a85c438ea75dc2795aca5176e3b31e89f0.tar.bz2 |
linting debian stuff
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | debian/compat | 2 | ||||
-rw-r--r-- | debian/control | 4 | ||||
-rwxr-xr-x | debian/iii.postinst | 2 | ||||
-rwxr-xr-x | debian/iii.postrm | 1 | ||||
-rw-r--r-- | debian/source/format | 1 | ||||
-rw-r--r-- | doc/000000000000.conf | 2 | ||||
-rw-r--r-- | src/eyefiservice.cc | 1 |
8 files changed, 8 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index d580f58..f79983e 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,63 +1,63 @@ | |||
1 | AC_INIT([iii], [0.2], [iii-bugs@klever.net]) | 1 | AC_INIT([iii], [0.2], [iii-bugs@klever.net]) |
2 | AC_CONFIG_SRCDIR([src/iiid.cc]) | 2 | AC_CONFIG_SRCDIR([src/iiid.cc]) |
3 | AC_CONFIG_HEADERS([config.h]) | 3 | AC_CONFIG_HEADERS([config.h]) |
4 | AM_INIT_AUTOMAKE([dist-bzip2]) | 4 | AM_INIT_AUTOMAKE([dist-bzip2]) |
5 | 5 | ||
6 | AC_PROG_INSTALL | 6 | AC_PROG_INSTALL |
7 | AC_PROG_CXX | 7 | AC_PROG_CXX |
8 | AC_PROG_CC | 8 | AC_PROG_CC |
9 | PKG_PROG_PKG_CONFIG | 9 | PKG_PROG_PKG_CONFIG |
10 | 10 | ||
11 | AC_HEADER_STDC | 11 | AC_HEADER_STDC |
12 | 12 | ||
13 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) | 13 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) |
14 | 14 | ||
15 | PKG_CHECK_MODULES([MODULES],[gsoap++ openssl libconfuse]) | 15 | PKG_CHECK_MODULES([MODULES],[gsoap++ libcrypto libconfuse]) |
16 | PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) | 16 | PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) |
17 | AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) | 17 | AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) |
18 | if $have_uuid ; then | 18 | if $have_uuid ; then |
19 | AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid]) | 19 | AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid]) |
20 | AC_SUBST([UUID_UUID],[uuid]) | 20 | AC_SUBST([UUID_UUID],[uuid]) |
21 | fi | 21 | fi |
22 | 22 | ||
23 | AC_PATH_PROG([SOAPCPP2],[soapcpp2],[false]) | 23 | AC_PATH_PROG([SOAPCPP2],[soapcpp2],[false]) |
24 | test "$SOAPCPP2" = "false" && AC_MSG_ERROR([no soapcpp2 tool, part of gsoap package, found.]) | 24 | test "$SOAPCPP2" = "false" && AC_MSG_ERROR([no soapcpp2 tool, part of gsoap package, found.]) |
25 | 25 | ||
26 | notfound=false | 26 | notfound=false |
27 | AC_CHECK_HEADERS([archive.h],[ | 27 | AC_CHECK_HEADERS([archive.h],[ |
28 | AC_CHECK_LIB([archive],[archive_read_new],,[notfound=true]) | 28 | AC_CHECK_LIB([archive],[archive_read_new],,[notfound=true]) |
29 | ],[notfound=true]) | 29 | ],[notfound=true]) |
30 | $notfound && AC_MSG_ERROR([no required libarchive library found. get one from http://people.freebsd.org/~kientzle/libarchive/]) | 30 | $notfound && AC_MSG_ERROR([no required libarchive library found. get one from http://people.freebsd.org/~kientzle/libarchive/]) |
31 | 31 | ||
32 | notfound=false | 32 | notfound=false |
33 | AC_LANG_PUSH([C++]) | 33 | AC_LANG_PUSH([C++]) |
34 | AC_CHECK_HEADERS([autosprintf.h],[ | 34 | AC_CHECK_HEADERS([autosprintf.h],[ |
35 | AC_CHECK_LIB([asprintf],[main],,[notfound=true]) | 35 | AC_CHECK_LIB([asprintf],[main],,[notfound=true]) |
36 | ],[notfound=true]) | 36 | ],[notfound=true]) |
37 | $notfound && AC_MSG_ERROR([no autosprintf, part of gettext, found]) | 37 | $notfound && AC_MSG_ERROR([no autosprintf, part of gettext, found]) |
38 | AC_LANG_POP([C++]) | 38 | AC_LANG_POP([C++]) |
39 | 39 | ||
40 | nitpick=false | 40 | nitpick=false |
41 | AC_ARG_ENABLE([nitpicking], | 41 | AC_ARG_ENABLE([nitpicking], |
42 | AC_HELP_STRING([--enable-nitpicking],[make compiler somewhat overly fastidious about the code it deals with]), | 42 | AC_HELP_STRING([--enable-nitpicking],[make compiler somewhat overly fastidious about the code it deals with]), |
43 | [ test "$enableval" = "no" || nitpick=true ] | 43 | [ test "$enableval" = "no" || nitpick=true ] |
44 | ) | 44 | ) |
45 | if $nitpick ; then | 45 | if $nitpick ; then |
46 | CPP_NITPICK="-pedantic -Wall -Wextra -Wundef -Wshadow \ | 46 | CPP_NITPICK="-pedantic -Wall -Wextra -Wundef -Wshadow \ |
47 | -Wunsafe-loop-optimizations -Wconversion -Wmissing-format-attribute \ | 47 | -Wunsafe-loop-optimizations -Wconversion -Wmissing-format-attribute \ |
48 | -Wredundant-decls -ansi -Wlogical-op -Wmissing-noreturn" | 48 | -Wredundant-decls -ansi -Wlogical-op -Wmissing-noreturn" |
49 | C_NITPICK="$CPP_NITPICK" | 49 | C_NITPICK="$CPP_NITPICK" |
50 | CXX_NITPICK="$C_NITPICK" | 50 | CXX_NITPICK="$C_NITPICK" |
51 | 51 | ||
52 | CPPFLAGS="$CPPFLAGS $CPP_NITPICK" | 52 | CPPFLAGS="$CPPFLAGS $CPP_NITPICK" |
53 | CFLAGS="$CFLAGS $C_NITPICK" | 53 | CFLAGS="$CFLAGS $C_NITPICK" |
54 | CXXFLAGS="$CXXFLAGS $CXX_NITPICK" | 54 | CXXFLAGS="$CXXFLAGS $CXX_NITPICK" |
55 | fi | 55 | fi |
56 | 56 | ||
57 | ndebug=true | 57 | ndebug=true |
58 | AC_ARG_ENABLE([debug], | 58 | AC_ARG_ENABLE([debug], |
59 | AC_HELP_STRING([--enable-debug],[enable debugging code]), | 59 | AC_HELP_STRING([--enable-debug],[enable debugging code]), |
60 | [ test "$enableval" = "no" || ndebug=false ] | 60 | [ test "$enableval" = "no" || ndebug=false ] |
61 | ) | 61 | ) |
62 | if $ndebug ; then | 62 | if $ndebug ; then |
63 | CPPFLAGS_DEBUG="-DNDEBUG" | 63 | CPPFLAGS_DEBUG="-DNDEBUG" |
diff --git a/debian/compat b/debian/compat index b8626c4..7ed6ff8 100644 --- a/debian/compat +++ b/debian/compat | |||
@@ -1 +1 @@ | |||
4 | 5 | ||
diff --git a/debian/control b/debian/control index 02a6138..aaa8c78 100644 --- a/debian/control +++ b/debian/control | |||
@@ -1,13 +1,13 @@ | |||
1 | Source: iii | 1 | Source: iii |
2 | Section: graphics | 2 | Section: graphics |
3 | Priority: optional | 3 | Priority: optional |
4 | Maintainer: Michael Krelin <hacker@klever.net> | 4 | Maintainer: Michael Krelin <hacker@klever.net> |
5 | Build-Depends: debhelper (>=7), gsoap, libssl-dev, libconfuse-dev, libarchive-dev, gettext | 5 | Build-Depends: debhelper (>=7), gsoap, libssl-dev, libconfuse-dev, libarchive-dev, gettext |
6 | Standards-Version: 3.8.0 | 6 | Standards-Version: 3.8.4 |
7 | 7 | ||
8 | Package: iii | 8 | Package: iii |
9 | Architecture: any | 9 | Architecture: any |
10 | Depends: adduser, ${shlibs:Depends} | 10 | Depends: adduser, ${shlibs:Depends}, ${misc:Depends} |
11 | Description: Eye-Fi Manager implementation | 11 | Description: Eye-Fi Manager implementation |
12 | Implementation of Eye-Fi manager service for Linux | 12 | Implementation of Eye-Fi manager service for Linux |
13 | 13 | ||
diff --git a/debian/iii.postinst b/debian/iii.postinst index 20463a1..f52bf84 100755 --- a/debian/iii.postinst +++ b/debian/iii.postinst | |||
@@ -1,18 +1,18 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | set -e | 2 | set -e |
3 | UG=eyefi | 3 | UG=eyefi |
4 | P=eyekindo | 4 | P=iii |
5 | H=/var/lib/$P | 5 | H=/var/lib/$P |
6 | 6 | ||
7 | if [ "$1" = configure ] ; then | 7 | if [ "$1" = configure ] ; then |
8 | getent group $UG >/dev/null 2>&1 || addgroup --system $UG | 8 | getent group $UG >/dev/null 2>&1 || addgroup --system $UG |
9 | getent passwd $UG >/dev/null 2>&1 || adduser --system --home $H \ | 9 | getent passwd $UG >/dev/null 2>&1 || adduser --system --home $H \ |
10 | --no-create-home --disabled-password --ingroup $UG $UG | 10 | --no-create-home --disabled-password --ingroup $UG $UG |
11 | if ! test -d $H ; then | 11 | if ! test -d $H ; then |
12 | mkdir -p $H | 12 | mkdir -p $H |
13 | chown $UG:$UG $H | 13 | chown $UG:$UG $H |
14 | chmod 2770 $H | 14 | chmod 2770 $H |
15 | fi | 15 | fi |
16 | fi | 16 | fi |
17 | 17 | ||
18 | #DEBHELPER# | 18 | #DEBHELPER# |
diff --git a/debian/iii.postrm b/debian/iii.postrm index a2c66fa..6060c4f 100755 --- a/debian/iii.postrm +++ b/debian/iii.postrm | |||
@@ -1,3 +1,4 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | set -e | ||
2 | 3 | ||
3 | #DEBHELPER# | 4 | #DEBHELPER# |
diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- a/dev/null +++ b/debian/source/format | |||
@@ -0,0 +1 @@ | |||
3.0 (native) | |||
diff --git a/doc/000000000000.conf b/doc/000000000000.conf index d7b365f..01f8fae 100644 --- a/doc/000000000000.conf +++ b/doc/000000000000.conf | |||
@@ -1,17 +1,17 @@ | |||
1 | # target directory for uploaded files, if the name contains %s, it is replaced | 1 | # target directory for uploaded files, if the name contains %s, it is replaced |
2 | # with eyefi card mac address. | 2 | # with eyefi card mac address. |
3 | targetdir = "/var/lib/eyekindo/%s/" | 3 | targetdir = "/var/lib/iii/%s/" |
4 | # the upload key as seen in Mac and (perhaps) windows Settings.xml file | 4 | # the upload key as seen in Mac and (perhaps) windows Settings.xml file |
5 | uploadkey = "e3e2c4a305cee6bce0ebb38a3259ac08" | 5 | uploadkey = "e3e2c4a305cee6bce0ebb38a3259ac08" |
6 | 6 | ||
7 | # commands to be executed at certain events, the commands also receive certain | 7 | # commands to be executed at certain events, the commands also receive certain |
8 | # values of interested passed via environment. | 8 | # values of interested passed via environment. |
9 | # for on-start-session: EYEFI_MACADDRESS, EYEFI_TRANSFER_MODE, EYEFI_TRANSFERMODETIMESTAMP | 9 | # for on-start-session: EYEFI_MACADDRESS, EYEFI_TRANSFER_MODE, EYEFI_TRANSFERMODETIMESTAMP |
10 | on-start-session = "bash /usr/local/lib/iii/on-start-session.bash" | 10 | on-start-session = "bash /usr/local/lib/iii/on-start-session.bash" |
11 | # for on-upload-photo: EYEFI_MACADDRESS, EYEFI_UPLOADED (uploaded file name) | 11 | # for on-upload-photo: EYEFI_MACADDRESS, EYEFI_UPLOADED (uploaded file name) |
12 | on-upload-photo = "bash /usr/local/lib/iii/on-upload-photo.bash" | 12 | on-upload-photo = "bash /usr/local/lib/iii/on-upload-photo.bash" |
13 | # for on-mark-last-photo-in-roll: EYEFI_MACADDRESS, EYEFI_MERGEDELTA | 13 | # for on-mark-last-photo-in-roll: EYEFI_MACADDRESS, EYEFI_MERGEDELTA |
14 | on-mark-last-photo-in-roll = "bash /usr/local/lib/iii/on-mark-last-photo-in-roll.bash" | 14 | on-mark-last-photo-in-roll = "bash /usr/local/lib/iii/on-mark-last-photo-in-roll.bash" |
15 | 15 | ||
16 | # file mode creation mask | 16 | # file mode creation mask |
17 | umask = 002 | 17 | umask = 002 |
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index 49521e0..9650ec1 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc | |||
@@ -1,57 +1,56 @@ | |||
1 | #include <cassert> | 1 | #include <cassert> |
2 | #include <iostream> | 2 | #include <iostream> |
3 | #include <fstream> | 3 | #include <fstream> |
4 | #include <stdexcept> | 4 | #include <stdexcept> |
5 | #include <iterator> | 5 | #include <iterator> |
6 | #include <syslog.h> | 6 | #include <syslog.h> |
7 | #include <sys/wait.h> | 7 | #include <sys/wait.h> |
8 | #include <autosprintf.h> | 8 | #include <autosprintf.h> |
9 | #include <openssl/rand.h> | ||
10 | #include "eyekinfig.h" | 9 | #include "eyekinfig.h" |
11 | #include "eyetil.h" | 10 | #include "eyetil.h" |
12 | #include "soapeyefiService.h" | 11 | #include "soapeyefiService.h" |
13 | 12 | ||
14 | static binary_t session_nonce; | 13 | static binary_t session_nonce; |
15 | 14 | ||
16 | static bool detached_child() { | 15 | static bool detached_child() { |
17 | pid_t p = fork(); | 16 | pid_t p = fork(); |
18 | if(p<0) throw std::runtime_error("failed to fork()"); | 17 | if(p<0) throw std::runtime_error("failed to fork()"); |
19 | if(!p) { | 18 | if(!p) { |
20 | p = fork(); | 19 | p = fork(); |
21 | if(p<0) { | 20 | if(p<0) { |
22 | syslog(LOG_ERR,"Failed to re-fork child process"); | 21 | syslog(LOG_ERR,"Failed to re-fork child process"); |
23 | _exit(-1); | 22 | _exit(-1); |
24 | } | 23 | } |
25 | if(!p) { | 24 | if(!p) { |
26 | setsid(); | 25 | setsid(); |
27 | for(int i=getdtablesize();i>=0;--i) close(i); | 26 | for(int i=getdtablesize();i>=0;--i) close(i); |
28 | int i=open("/dev/null",O_RDWR); assert(i==0); | 27 | int i=open("/dev/null",O_RDWR); assert(i==0); |
29 | i = dup(i); assert(i==1); | 28 | i = dup(i); assert(i==1); |
30 | i = dup(i); assert(i==2); | 29 | i = dup(i); assert(i==2); |
31 | return true; | 30 | return true; |
32 | } | 31 | } |
33 | _exit(0); | 32 | _exit(0); |
34 | } | 33 | } |
35 | int rc; | 34 | int rc; |
36 | if(waitpid(p,&rc,0)<0) throw std::runtime_error("failed to waitpid()"); | 35 | if(waitpid(p,&rc,0)<0) throw std::runtime_error("failed to waitpid()"); |
37 | if(!WIFEXITED(rc)) throw std::runtime_error("error in forked process"); | 36 | if(!WIFEXITED(rc)) throw std::runtime_error("error in forked process"); |
38 | if(WEXITSTATUS(rc)) throw std::runtime_error("forked process signalled error"); | 37 | if(WEXITSTATUS(rc)) throw std::runtime_error("forked process signalled error"); |
39 | return false; | 38 | return false; |
40 | } | 39 | } |
41 | 40 | ||
42 | int eyefiService::StartSession( | 41 | int eyefiService::StartSession( |
43 | std::string macaddress,std::string cnonce, | 42 | std::string macaddress,std::string cnonce, |
44 | int transfermode,long transfermodetimestamp, | 43 | int transfermode,long transfermodetimestamp, |
45 | struct rns__StartSessionResponse &r ) try { | 44 | struct rns__StartSessionResponse &r ) try { |
46 | #ifndef NDEBUG | 45 | #ifndef NDEBUG |
47 | syslog(LOG_DEBUG, | 46 | syslog(LOG_DEBUG, |
48 | "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld", | 47 | "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld", |
49 | macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp ); | 48 | macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp ); |
50 | #endif | 49 | #endif |
51 | eyekinfig_t eyekinfig(macaddress); | 50 | eyekinfig_t eyekinfig(macaddress); |
52 | r.credential = binary_t(macaddress+cnonce+eyekinfig.get_upload_key()).md5().hex(); | 51 | r.credential = binary_t(macaddress+cnonce+eyekinfig.get_upload_key()).md5().hex(); |
53 | 52 | ||
54 | r.snonce = session_nonce.make_nonce().hex(); | 53 | r.snonce = session_nonce.make_nonce().hex(); |
55 | r.transfermode=transfermode; | 54 | r.transfermode=transfermode; |
56 | r.transfermodetimestamp=transfermodetimestamp; | 55 | r.transfermodetimestamp=transfermodetimestamp; |
57 | r.upsyncallowed=false; | 56 | r.upsyncallowed=false; |