ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-03-15 00:36:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add more useful error messages to meshmb failure responses

Browse Source
This commit is contained in:
Paul Gardner-Stephen 2018-11-14 15:59:30 +10:30
parent 2ec4744460
commit 7a222e3869
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
meshmb_restful.c
View File

@ -148,14 +148,23 @@ static int send_content_end(struct http_request *hr)
struct meshmb_session *session = open_session(&r->bid);
int ret;
int send_result=0;
int flush_result=0;
if (session
&& meshmb_send(session->feeds, r->u.sendmsg.message.buffer, r->u.sendmsg.message.length, 0, NULL)!=-1
&& meshmb_flush(session->feeds)!=-1){
http_request_simple_response(&r->http, 201, "TODO, detailed response");
&& (send_result=meshmb_send(session->feeds, r->u.sendmsg.message.buffer, r->u.sendmsg.message.length, 0, NULL))!=-1
&& (flush_result=meshmb_flush(session->feeds))!=-1){
http_request_simple_response(&r->http, 201, "Message sent and flushed");
ret = 201;
}else{
http_request_simple_response(&r->http, 500, "TODO, detailed response");
if ( !session )
http_request_simple_response(&r->http, 500, "No session");
elsif (send_result==-1)
http_request_simple_response(&r->http, 500, "meshmb_send() failed");
elsif (send_result==-1)
http_request_simple_response(&r->http, 500, "meshmb_flush() failed");
else
http_request_simple_response(&r->http, 500, "Seemingly impossible error");
ret = 500;
}
if (session)
@ -534,10 +543,10 @@ static int restful_meshmb_follow_ignore(httpd_request *r, const char *remainder)
if (ret!=-1
&& meshmb_flush(session->feeds)!=-1){
http_request_simple_response(&r->http, 201, "TODO, detailed response");
http_request_simple_response(&r->http, 201, "Message flushed");
ret = 201;
}else{
http_request_simple_response(&r->http, 500, "TODO, detailed response");
http_request_simple_response(&r->http, 500, "meshmb_flush() failed (2)");
ret = 500;
}
if (session)
@ -668,7 +677,7 @@ static int restful_meshmb_feedlist(httpd_request *r, const char *remainder)
struct meshmb_session *session = open_session(&r->bid);
if (!session){
http_request_simple_response(&r->http, 500, "TODO, detailed response");
http_request_simple_response(&r->http, 500, "open_session() for MeshMB failed");
return 500;
}
@ -871,7 +880,7 @@ static int restful_meshmb_activity(httpd_request *r, const char *remainder)
struct meshmb_session *session = open_session(&r->bid);
if (!session){
http_request_simple_response(&r->http, 500, "TODO, detailed response");
http_request_simple_response(&r->http, 500, "open_session() for MeshMB failed (2)");
return 500;
}
assert(r->finalise_union == NULL);