diff options
Diffstat (limited to 'map-server')
| -rwxr-xr-x | map-server/altos-map/altos-map-fake (renamed from map-server/altos-map/altos-mapc-fake) | 3 | ||||
| -rw-r--r-- | map-server/altos-map/altos-map.c | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/map-server/altos-map/altos-mapc-fake b/map-server/altos-map/altos-map-fake index 9e22f76f..1bf5f8e2 100755 --- a/map-server/altos-map/altos-mapc-fake +++ b/map-server/altos-map/altos-map-fake @@ -2,5 +2,4 @@ # map-N43.799102,W120.586281-hybrid-20.jpg export QUERY_STRING="lat=43.799102&lon=-120.586281&zoom=20" export REMOTE_ADDR="127.0.0.1" -./altos-mapc - +./altos-map diff --git a/map-server/altos-map/altos-map.c b/map-server/altos-map/altos-map.c index 690ec728..38701076 100644 --- a/map-server/altos-map/altos-map.c +++ b/map-server/altos-map/altos-map.c @@ -226,16 +226,23 @@ int main(int argc, char **argv) if (s < 0) fail(408, "Cannot connect AltOS map daemon"); + FILE *sf = fdopen(s, "r+"); + + if (sf == NULL) + fail(400, "allocation failure"); + json_t *request = json_pack("{s:f s:f s:i s:s}", "lat", lat, "lon", lon, "zoom", zoom, "remote_addr", remote_addr); if (request == NULL) fail(400, "Cannot create JSON request"); - if (json_dumpfd(request, s, 0) < 0) + if (json_dumpf(request, sf, 0) < 0) fail(400, "Cannot write JSON request"); + fflush(sf); + json_error_t error; - json_t *reply = json_loadfd(s, 0, &error); + json_t *reply = json_loadf(sf, 0, &error); if (!reply) fail(400, "Cannot read JSON reply"); |