small code cleaning
PATCH 1/1 small code cleaning
Hello,
Here's a small patchset that brings some code cleaning and aim at improving usability of ulogd.
Patchset statistics:
TODO | 7 ------- include/ulogd/conffile.h | 7 ++++--- input/packet/ulogd_inppkt_NFLOG.c | 2 -- output/ulogd_output_LOGEMU.c | 5 +---- src/conffile.c | 31 +++++++++++++++++++++++++++++-- src/ulogd.c | 12 ++++++++++-- 6 files changed, 44 insertions(+), 20 deletions(-)
If everybody is happy with this patchset, I will pushed it to git tree and prepare a release in the upcoming weeks.
BR,
--
Eric Leblond <[email protected]>
PATCH 1/7 Update TODO.
Try to sync TODO with real state of the project.
--- TODO | 7 ------- 1 file changed, 7 deletions(-)
TODO +0 -7
@@ -1,11 +1,4 @@ -- autoconf/automake detection of libnetfilter_{log,conntrack}, mysql, pgsql, sqlite3, pcap -- conditional compilation of NFLOG, CTNL, PGSQL, MYSQL, SQLITE3, PCAP plugins - add support for capabilities to run as non-root -- IPv6 support (core and extensions) - support for static linking - issues with ulogd_BASE and partially copied packets (--ulog-cprange) - problem wrt. ulogd_BASE and fragments -- cleanup keys after we've propagatet through the whole stack (RETF_VALID, FREE) -- port SQLITE3 plugin -- convert db layer and pgsql + mysql plugin to a 'parameter bind' scheme for efficiency -- autoconf detection of SCTP / DCCP support
Signature · 1 line
1.7.10.4
PATCH 2/7 Suppress dead FIXME.
In reply to Eric Leblond--- input/packet/ulogd_inppkt_NFLOG.c | 2 -- src/ulogd.c | 1 - 2 files changed, 3 deletions(-)
input/packet/ulogd_inppkt_NFLOG.c +0 -2
@@ -339,7 +339,6 @@ interp_packet(struct ulogd_pluginstance *upi, u_int8_t pf_family, label_ce(upi->config_kset).u.value);if (ph) { -/* FIXME */ okey_set_u8 (&ret[NFLOG_KEY_OOB_HOOK ], ph->hook);okey_set_u16 (&ret[NFLOG_KEY_OOB_PROTOCOL ],ntohs (ph->hw_protocol));
@@ -376,7 +375,6 @@ interp_packet(struct ulogd_pluginstance *upi, u_int8_t pf_family,if (! (nflog_get_timestamp (ldata, &ts) ==0 && ts.tv_sec))gettimeofday (&ts,NULL ); -/* FIXME: convert endianness */ okey_set_u32 (&ret[NFLOG_KEY_OOB_TIME_SEC ], ts.tv_sec &0xffffffff );okey_set_u32 (&ret[NFLOG_KEY_OOB_TIME_USEC ], ts.tv_usec &0xffffffff );
src/ulogd.c +0 -1
@@ -1102,7 +1102,6 @@ static void signal_handler(int signal)static void print_usage (void ) { -/* FIXME */ printf ("ulogd Version %s\n" ,VERSION );printf (COPYRIGHT );printf ("This is free software with ABSOLUTELY NO WARRANTY.\n\n" );
Signature · 1 line
1.7.10.4
PATCH 3/7 Use access to ensure readability of config gile
In reply to Eric LeblondThis patch adds a call to access to check the readability of the configuration file.
--- src/conffile.c | 11 ++++++++++- src/ulogd.c | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-)
src/conffile.c +10 -1
@@ -16,9 +16,11 @@* along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <ulogd/ulogd.h> #include <ulogd/common.h> #include <ulogd/conffile.h> +#include <unistd.h> /* points to config entry with error */
@@ -89,10 +91,17 @@ static char *get_word(char *line, char *not, char *buf)/* register config file with us */ int config_register_file (const char *file) { -/* FIXME: stat of file */ if (fname)return 1 ; +if (access (file,R_OK ) !=0 ) { +ulogd_log (ULOGD_ERROR , +"unable to read configfile \"%s\": %s\n" , + file, +strerror (errno)); +return 1 ; + } +pr_debug ("%s: registered config file '%s'\n" , __func__, file); fname = (char *)malloc (strlen (file)+1 );
src/ulogd.c +1 -1
@@ -1216,7 +1216,7 @@ int main(int argc, char* argv[])/* parse config file */ if (parse_conffile ("global" , &ulogd_kset)) { -ulogd_log (ULOGD_FATAL ,"parse_conffile\n" ); +ulogd_log (ULOGD_FATAL ,"unable to parse config file\n" );warn_and_exit (daemonize); }
Signature · 1 line
1.7.10.4
PATCH 4/7 Fix typo in comments.
In reply to Eric Leblond--- include/ulogd/conffile.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/ulogd/conffile.h +3 -3
@@ -20,13 +20,13 @@ enum { ERRSECTION, /* section not found */ }; -/* maximum line lenght of config file entries */ +/* maximum line length of config file entries */ #define LINE_LEN 255 -/* maximum lenght of config key name */ +/* maximum length of config key name */ #define CONFIG_KEY_LEN 30 -/* maximum lenght of string config value */ +/* maximum length of string config value */ #define CONFIG_VAL_STRING_LEN 225/* valid config types */
Signature · 1 line
1.7.10.4
PATCH 5/7 Add handling of too long arguments.
In reply to Eric LeblondWhen an argument is too long, it can not be store into ulogd configuration and this must results in a error.
--- include/ulogd/conffile.h | 1 + src/conffile.c | 5 ++++- src/ulogd.c | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-)
include/ulogd/conffile.h +1 -0
@@ -18,6 +18,7 @@ enum {ERRMAND ,/* mandatory option not found */ ERRUNKN ,/* unknown config key */ ERRSECTION ,/* section not found */ + ERRTOOLONG, /* string too long */ };/* maximum line length of config file entries */
src/conffile.c +4 -1
@@ -197,7 +197,10 @@ int config_parse_file(const char *section, struct config_keyset *kset)if (strlen (args) <CONFIG_VAL_STRING_LEN ) {strcpy (ce->u.string, args); -/* FIXME: what if not ? */ + }else { + config_errce = ce; + err = -ERRTOOLONG ; + goto cpf_error; }break ;case CONFIG_TYPE_INT :
src/ulogd.c +5 -0
@@ -989,6 +989,11 @@ static int parse_conffile(const char *section, struct config_keyset *ce)ulogd_log (ULOGD_ERROR ,"section \"%s\" not found\n" , section);break ; +case -ERRTOOLONG : +ulogd_log (ULOGD_ERROR , +"too long string value for key \"%s\"\n" , + config_errce->key); +break ; }return 1 ; }
Signature · 1 line
1.7.10.4
PATCH 6/7 logemu: return error if configuration is invalid.
In reply to Eric Leblond--- output/ulogd_output_LOGEMU.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
output/ulogd_output_LOGEMU.c +1 -4
@@ -177,11 +177,8 @@ static int fini_logemu(struct ulogd_pluginstance *pi) {static int configure_logemu (struct ulogd_pluginstance *pi,struct ulogd_pluginstance_stack *stack) { -/* FIXME: error handling */ ulogd_log (ULOGD_DEBUG ,"parsing config file section %s\n" , pi->id); -config_parse_file (pi->id, pi->config_kset); - -return 0 ; +return config_parse_file (pi->id, pi->config_kset); }static struct ulogd_plugin logemu_plugin = {
Signature · 1 line
1.7.10.4
PATCH 7/7 conf: error handling for too long line
In reply to Eric LeblondLine length in configuration file is limited to 255 due to the use of a static buffer for line reading. Accepting too long line without warning as it is currently done could result in some unexplainable failure.
This patch adds error handling and reject configuration file if a non comment line is longer than the maximum value.
--- src/conffile.c | 15 +++++++++++++++ src/ulogd.c | 10 +++++++--- 2 files changed, 22 insertions(+), 3 deletions(-)
src/conffile.c +15 -0
@@ -123,6 +123,7 @@ int config_parse_file(const char *section, struct config_keyset *kset)unsigned int i;char linebuf[LINE_LEN +1 ];char *line = linebuf; +int linenum =0 ;pr_debug ("%s: section='%s' file='%s'\n" , __func__, section, fname);
@@ -135,9 +136,16 @@ int config_parse_file(const char *section, struct config_keyset *kset)char wordbuf[LINE_LEN ];char *wordend; + linenum++;if (*line =='#' )continue ; +/* if line was fetch completely, string ends with '\n' */ +if (!strchr (line,'\n' )) { +ulogd_log (ULOGD_ERROR ,"line %d too long.\n" , linenum); +return -ERRTOOLONG ; + } +if (!(wordend =get_word (line," \t\n[]" , (char *) wordbuf)))continue ;pr_debug ("word: \"%s\"\n" , wordbuf);
@@ -159,10 +167,17 @@ int config_parse_file(const char *section, struct config_keyset *kset)char wordbuf[LINE_LEN ];char *wordend; + linenum++;pr_debug ("line read: %s\n" , line);if (*line =='#' )continue ; +/* if line was fetch completely, string ends with '\n' */ +if (!strchr (line,'\n' )) { +ulogd_log (ULOGD_ERROR ,"line %d too long.\n" , linenum); +return -ERRTOOLONG ; + } +if (!(wordend =get_word (line," =\t\n" , (char *) &wordbuf)))continue ;
src/ulogd.c +7 -3
@@ -990,9 +990,13 @@ static int parse_conffile(const char *section, struct config_keyset *ce) "section \"%s\" not found\n", section);break ;case -ERRTOOLONG : -ulogd_log (ULOGD_ERROR , -"too long string value for key \"%s\"\n" , - config_errce->key); +if (config_errce->key) +ulogd_log (ULOGD_ERROR , +"too long string value for key \"%s\"\n" , + config_errce->key); +else +ulogd_log (ULOGD_ERROR , +"too long string value\n" );break ; }return 1 ;
Signature · 1 line
1.7.10.4
Re: [PATCH 5/7] Add handling of too long arguments.
In reply to Eric Leblondsrc/ulogd.c static int parse_conffile(const char *section, struct config_keyset *ce) · line 994
Quoted 3 lines
src/ulogd.c +1
-0+ "too long string value for key \"%s\"\n",
"string value too long for key"
Re: [PATCH 7/7] conf: error handling for too long line
In reply to Eric Leblondsrc/ulogd.c static int parse_conffile(const char *section, struct config_keyset *ce) · line 995
Quoted 3 lines
src/ulogd.c +1
-0+ "too long string value for key \"%s\"\n",
"string value too long for key"
Re: [PATCH 5/7] Add handling of too long arguments.
In reply to Mr Dash FourHi,
Quoted 3 lines · Mr Dash Four
src/ulogd.c static int parse_conffile(const char *section, struct config_keyset *ce) · line 994
Quoted 2 lines
src/ulogd.c +1
-0+ "too long string value for key \"%s\"\n","string value too long for key"
Thanks a lot. Fixing this and the other one!
BR,
Signature · 2 lines
Eric Leblond <[email protected]> Blog: https://home.regit.org/
Hello,
Quoted 4 lines · Eric Leblond
Hello,
Here's a small patchset that brings some code cleaning and aim at improving usability of ulogd.
Patchset has been pushed to master with minor modifications.
BR,
--
Eric Leblond <[email protected]>