diff options
| author | Christian Grothoff <christian@grothoff.org> | 2021-08-19 11:33:57 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2021-08-19 11:33:57 +0200 |
| commit | 17794d73481f474a98d15fe1c5a46813adbf3a14 (patch) | |
| tree | 3328d640412762b309c3c8ec6df0c49dcabc8ed8 | |
| parent | 66ac3fea81b8b7b160cce5d7f2bf1fda1ef7218b (diff) | |
| download | sync-17794d73481f474a98d15fe1c5a46813adbf3a14.tar.gz sync-17794d73481f474a98d15fe1c5a46813adbf3a14.tar.bz2 sync-17794d73481f474a98d15fe1c5a46813adbf3a14.zip | |
-combine /terms and /config
| -rw-r--r-- | src/sync/Makefile.am | 3 | ||||
| -rw-r--r-- | src/sync/sync-httpd.c | 5 | ||||
| -rw-r--r-- | src/sync/sync-httpd_config.c | 4 | ||||
| -rw-r--r-- | src/sync/sync-httpd_terms.c | 4 |
4 files changed, 6 insertions, 10 deletions
diff --git a/src/sync/Makefile.am b/src/sync/Makefile.am index 33c79a3..6e71014 100644 --- a/src/sync/Makefile.am +++ b/src/sync/Makefile.am @@ -19,8 +19,7 @@ sync_httpd_SOURCES = \ sync-httpd_backup.c sync-httpd_backup.h \ sync-httpd_backup_post.c \ sync-httpd_config.c sync-httpd_config.h \ - sync-httpd_mhd.c sync-httpd_mhd.h \ - sync-httpd_terms.c sync-httpd_terms.h + sync-httpd_mhd.c sync-httpd_mhd.h sync_httpd_LDADD = \ $(top_builddir)/src/util/libsyncutil.la \ $(top_builddir)/src/syncdb/libsyncdb.la \ diff --git a/src/sync/sync-httpd.c b/src/sync/sync-httpd.c index 329bc96..b05de88 100644 --- a/src/sync/sync-httpd.c +++ b/src/sync/sync-httpd.c @@ -181,10 +181,7 @@ url_handler (void *cls, &SH_handler_config, MHD_HTTP_FOUND }, { "/config", MHD_HTTP_METHOD_GET, "text/json", NULL, 0, - &SH_handler_terms, MHD_HTTP_OK }, - { "/terms", MHD_HTTP_METHOD_GET, "text/plain", - NULL, 0, - &SH_handler_terms, MHD_HTTP_OK }, + &SH_handler_config, MHD_HTTP_OK }, {NULL, NULL, NULL, NULL, 0, 0 } }; static struct SH_RequestHandler h404 = { diff --git a/src/sync/sync-httpd_config.c b/src/sync/sync-httpd_config.c index 065bbdd..91c481c 100644 --- a/src/sync/sync-httpd_config.c +++ b/src/sync/sync-httpd_config.c @@ -54,6 +54,10 @@ SH_handler_config (struct SH_RequestHandler *rh, MHD_HTTP_OK, GNUNET_JSON_pack_string ("name", "sync"), + GNUNET_JSON_pack_uint64 ("storage_limit_in_megabytes", + SH_upload_limit_mb), + TALER_JSON_pack_amount ("annual_fee", + &SH_annual_fee), GNUNET_JSON_pack_string ("version", "1:0:1")); } diff --git a/src/sync/sync-httpd_terms.c b/src/sync/sync-httpd_terms.c index 2ff0101..0ccf26d 100644 --- a/src/sync/sync-httpd_terms.c +++ b/src/sync/sync-httpd_terms.c @@ -43,10 +43,6 @@ SH_handler_terms (struct SH_RequestHandler *rh, return TALER_MHD_REPLY_JSON_PACK ( connection, MHD_HTTP_OK, - GNUNET_JSON_pack_uint64 ("storage_limit_in_megabytes", - SH_upload_limit_mb), - TALER_JSON_pack_amount ("annual_fee", - &SH_annual_fee), GNUNET_JSON_pack_string ("version", "0.0")); } |