From (spam-protected) Thu Sep 14 10:03:32 2006 From: (spam-protected) (Andreas Tønnesen) Date: Thu, 14 Sep 2006 08:03:32 +0000 Subject: [Olsr-cvs] olsrd-current/src/cfgparser olsrd_conf.c,1.49,1.50 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/cfgparser In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32221/src/cfgparser Modified Files: olsrd_conf.c Log Message: Check for NULL return for malloc Index: olsrd_conf.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/olsrd_conf.c,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** olsrd_conf.c 17 Apr 2006 18:31:09 -0000 1.49 --- olsrd_conf.c 14 Sep 2006 08:03:29 -0000 1.50 *************** *** 111,115 **** fprintf(stderr, "Out of memory %s\n", __func__); return NULL; ! } set_default_cnf(cnf); --- 111,115 ---- fprintf(stderr, "Out of memory %s\n", __func__); return NULL; ! } set_default_cnf(cnf); *************** *** 125,129 **** free(cnf); return NULL; ! } current_line = 1; --- 125,129 ---- free(cnf); return NULL; ! } current_line = 1; *************** *** 427,431 **** fprintf(stderr, "Out of memory %s\n", __func__); return NULL; ! } set_default_cnf(cnf); --- 427,431 ---- fprintf(stderr, "Out of memory %s\n", __func__); return NULL; ! } set_default_cnf(cnf); *************** *** 486,490 **** struct if_config_options *io = malloc(sizeof(struct if_config_options)); struct in6_addr in6; ! memset(io, 0, sizeof(struct if_config_options)); --- 486,496 ---- struct if_config_options *io = malloc(sizeof(struct if_config_options)); struct in6_addr in6; ! ! if(io == NULL) ! { ! fprintf(stderr, "Out of memory %s\n", __func__); ! return NULL; ! } ! memset(io, 0, sizeof(struct if_config_options)); From (spam-protected) Thu Sep 14 10:05:10 2006 From: (spam-protected) (Andreas Tønnesen) Date: Thu, 14 Sep 2006 08:05:10 +0000 Subject: [Olsr-cvs] olsrd-current/src/cfgparser olsrd_conf.c, 1.46.2.1, 1.46.2.2 Message-ID: Update of /cvsroot/olsrd/olsrd-current/src/cfgparser In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv469/src/cfgparser Modified Files: Tag: olsrd_04 olsrd_conf.c Log Message: Check for NULL return for malloc Index: olsrd_conf.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/olsrd_conf.c,v retrieving revision 1.46.2.1 retrieving revision 1.46.2.2 diff -C2 -d -r1.46.2.1 -r1.46.2.2 *** olsrd_conf.c 17 Apr 2006 18:25:29 -0000 1.46.2.1 --- olsrd_conf.c 14 Sep 2006 08:05:07 -0000 1.46.2.2 *************** *** 111,115 **** fprintf(stderr, "Out of memory %s\n", __func__); return NULL; ! } set_default_cnf(cnf); --- 111,115 ---- fprintf(stderr, "Out of memory %s\n", __func__); return NULL; ! } set_default_cnf(cnf); *************** *** 125,129 **** free(cnf); return NULL; ! } current_line = 1; --- 125,129 ---- free(cnf); return NULL; ! } current_line = 1; *************** *** 427,431 **** fprintf(stderr, "Out of memory %s\n", __func__); return NULL; ! } set_default_cnf(cnf); --- 427,431 ---- fprintf(stderr, "Out of memory %s\n", __func__); return NULL; ! } set_default_cnf(cnf); *************** *** 478,482 **** struct if_config_options *io = malloc(sizeof(struct if_config_options)); struct in6_addr in6; ! memset(io, 0, sizeof(struct if_config_options)); --- 478,488 ---- struct if_config_options *io = malloc(sizeof(struct if_config_options)); struct in6_addr in6; ! ! if(io == NULL) ! { ! fprintf(stderr, "Out of memory %s\n", __func__); ! return NULL; ! } ! memset(io, 0, sizeof(struct if_config_options)); From (spam-protected) Sun Sep 17 20:29:14 2006 From: (spam-protected) (Andreas Tønnesen) Date: Sun, 17 Sep 2006 18:29:14 +0000 Subject: [Olsr-cvs] olsrd-current/lib/powerinfo Makefile, 1.14, NONE README_POWER, 1.4, NONE version-script.txt, 1.2, NONE Message-ID: Update of /cvsroot/olsrd/olsrd-current/lib/powerinfo In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5848/powerinfo Removed Files: Makefile README_POWER version-script.txt Log Message: Removing powerinfo plugin as the mini pulgin now serves as an example --- README_POWER DELETED --- --- Makefile DELETED --- --- version-script.txt DELETED --- From (spam-protected) Sun Sep 17 20:29:14 2006 From: (spam-protected) (Andreas Tønnesen) Date: Sun, 17 Sep 2006 18:29:14 +0000 Subject: [Olsr-cvs] olsrd-current/lib/powerinfo/src olsrd_plugin.c, 1.7, NONE olsrd_power.c, 1.16, NONE olsrd_power.h, 1.4, NONE Message-ID: Update of /cvsroot/olsrd/olsrd-current/lib/powerinfo/src In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5848/powerinfo/src Removed Files: olsrd_plugin.c olsrd_power.c olsrd_power.h Log Message: Removing powerinfo plugin as the mini pulgin now serves as an example --- olsrd_power.c DELETED --- --- olsrd_power.h DELETED --- --- olsrd_plugin.c DELETED --- From (spam-protected) Sun Sep 17 20:30:15 2006 From: (spam-protected) (Andreas Tønnesen) Date: Sun, 17 Sep 2006 18:30:15 +0000 Subject: [Olsr-cvs] olsrd-current/lib/powerinfo .cvsignore,1.1,NONE Message-ID: Update of /cvsroot/olsrd/olsrd-current/lib/powerinfo In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6293 Removed Files: .cvsignore Log Message: Removing powerinfo plugin as the mini pulgin now serves as an example --- .cvsignore DELETED --- From (spam-protected) Mon Sep 18 20:55:32 2006 From: (spam-protected) (Andreas Tønnesen) Date: Mon, 18 Sep 2006 18:55:32 +0000 Subject: [Olsr-cvs] olsrd-current/lib/httpinfo/src admin_interface.c, 1.6, 1.7 olsrd_httpinfo.c, 1.58, 1.59 Message-ID: Update of /cvsroot/olsrd/olsrd-current/lib/httpinfo/src In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1191/src Modified Files: admin_interface.c olsrd_httpinfo.c Log Message: Fixed various bugs related to NETDIRECT stuff in httpinfo plugin Index: olsrd_httpinfo.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/lib/httpinfo/src/olsrd_httpinfo.c,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** olsrd_httpinfo.c 7 Jan 2006 08:17:43 -0000 1.58 --- olsrd_httpinfo.c 18 Sep 2006 18:55:30 -0000 1.59 *************** *** 1192,1196 **** } ! size += olsrd_write_cnf_buf(olsr_cnf, &buf[size], bufsize-size); if(size < 0) --- 1192,1207 ---- } ! #ifdef NETDIRECT ! { ! /* Hack to make netdirect stuff work with ! olsrd_write_cnf_buf ! */ ! char tmpBuf[10000]; ! size = olsrd_write_cnf_buf(olsr_cnf, tmpBuf, 10000); ! sprintf(&buf[size], tmpBuf); ! } ! #else ! size += olsrd_write_cnf_buf(olsr_cnf, &buf[size], bufsize - size); ! #endif if(size < 0) *************** *** 1205,1209 **** i++; } ! return size; } --- 1216,1220 ---- i++; } ! printf("RETURNING %d\n", size); return size; } Index: admin_interface.c =================================================================== RCS file: /cvsroot/olsrd/olsrd-current/lib/httpinfo/src/admin_interface.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** admin_interface.c 29 May 2005 12:47:41 -0000 1.6 --- admin_interface.c 18 Sep 2006 18:55:30 -0000 1.7 *************** *** 54,57 **** --- 54,61 ---- #include + extern int netsprintf(char *str, const char* format, ...); + #define sprintf netsprintf + #define NETDIRECT + int build_admin_body(char *buf, olsr_u32_t bufsize)