altos-map: Switch from json FD ops to json FILE ops

[fw/altos] / map-server / altos-map / altos-map.c

diff --git a/map-server/altos-map/altos-map.c b/map-server/altos-map/altos-map.c
index 690ec728f9d033c22bc0296172bf3144f22caf79..38701076c4a7eb29928d1dcb14474430c499cfce 100644 (file)
--- 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");
 
        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");
 
        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");
 
                fail(400, "Cannot write JSON request");
 

+       fflush(sf);
+

        json_error_t    error;
        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");
 
        if (!reply)
                fail(400, "Cannot read JSON reply");