Add ability to drop overly large packets

[onak.git] / onak.c

diff --git a/onak.c b/onak.c
index 0c4673d7704323723c53133b9cc429f2700bd5c9..085a876c54c9dac6ceb1d4f22bbb8ec2fcff8f91 100644 (file)
--- a/onak.c
+++ b/onak.c
@@ -15,8 +15,7 @@
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <fcntl.h>
@@ -207,7 +206,7 @@ int main(int argc, char *argv[])
        if ((argc - optind) < 1) {
                usage();
        } else if (!strcmp("dump", argv[optind])) {
-               dbctx = config.dbinit(true);
+               dbctx = config.dbinit(config.backend, true);
                dumpstate.count = dumpstate.filenum = 0;
                dumpstate.maxcount = 100000;
                dumpstate.fd = -1;
@@ -234,11 +233,11 @@ int main(int argc, char *argv[])
                        logthing(LOGTHING_INFO, "Finished reading %d keys.",
                                        result);
 
-                       result = cleankeys(keys);
+                       result = cleankeys(&keys, config.clean_policies);
                        logthing(LOGTHING_INFO, "%d keys cleaned.",
                                        result);
 
-                       dbctx = config.dbinit(false);
+                       dbctx = config.dbinit(config.backend, false);
                        logthing(LOGTHING_NOTICE, "Got %d new keys.",
                                        dbctx->update_keys(dbctx, &keys,
                                        false));
@@ -289,7 +288,8 @@ int main(int argc, char *argv[])
                                        result);
 
                        if (keys != NULL) {
-                               result = cleankeys(keys);
+                               result = cleankeys(&keys,
+                                               config.clean_policies);
                                logthing(LOGTHING_INFO, "%d keys cleaned.",
                                                result);
 
@@ -318,6 +318,13 @@ int main(int argc, char *argv[])
                        free_publickey(keys);
                        keys = NULL;
                }
+       } else if (!strcmp("dumpconfig", argv[optind])) {
+               if ((argc - optind) == 2) {
+                       writeconfig(argv[optind + 1]);
+               } else {
+                       /* Dump config to stdout */
+                       writeconfig(NULL);
+               }
        } else if ((argc - optind) == 2) {
                search = argv[optind+1];
                if (search != NULL && strlen(search) == 42 &&
@@ -337,7 +344,7 @@ int main(int argc, char *argv[])
                                ishex = true;
                        }
                }
-               dbctx = config.dbinit(false);
+               dbctx = config.dbinit(config.backend, false);
                if (!strcmp("index", argv[optind])) {
                        find_keys(dbctx, search, keyid, &fingerprint, ishex,
                                        isfp, dispfp, skshash,
@@ -430,7 +437,7 @@ int main(int argc, char *argv[])
                        dbctx->starttrans(dbctx);
                        if (dbctx->fetch_key_id(dbctx, keyid, &keys, true)) {
                                dbctx->delete_key(dbctx, keyid, true);
-                               cleankeys(keys);
+                               cleankeys(&keys, config.clean_policies);
                                dbctx->store_key(dbctx, keys, true, false);
                        } else {
                                puts("Key not found");
@@ -444,6 +451,7 @@ int main(int argc, char *argv[])
 
        cleanuplogthing();
        cleanupconfig();
+       free(configfile);
 
        return rc;
 }