Andrew Bonney
Modified version of NetServices. Fixes an issue where connections failed should the HTTP response status line be received in a packet on its own prior to any further headers. Changes are made to the HTTPClient.cpp file's readHeaders method.
services/http/server/impl/RPCHandler.cpp@0:ec559500a63f, 2011-04-08 (annotated)
- Committer:
- andrewbonney
- Date:
- Fri Apr 08 14:39:41 2011 +0000
- Revision:
- 0:ec559500a63f
Who changed what in which revision?
| User | Revision | Line number | New contents of line |
|---|---|---|---|
| andrewbonney | 0:ec559500a63f | 1 | #pragma diag_remark 1293 |
| andrewbonney | 0:ec559500a63f | 2 | /* |
| andrewbonney | 0:ec559500a63f | 3 | Copyright (c) 2010 Donatien Garnier (donatiengar [at] gmail [dot] com) |
| andrewbonney | 0:ec559500a63f | 4 | |
| andrewbonney | 0:ec559500a63f | 5 | Permission is hereby granted, free of charge, to any person obtaining a copy |
| andrewbonney | 0:ec559500a63f | 6 | of this software and associated documentation files (the "Software"), to deal |
| andrewbonney | 0:ec559500a63f | 7 | in the Software without restriction, including without limitation the rights |
| andrewbonney | 0:ec559500a63f | 8 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
| andrewbonney | 0:ec559500a63f | 9 | copies of the Software, and to permit persons to whom the Software is |
| andrewbonney | 0:ec559500a63f | 10 | furnished to do so, subject to the following conditions: |
| andrewbonney | 0:ec559500a63f | 11 | |
| andrewbonney | 0:ec559500a63f | 12 | The above copyright notice and this permission notice shall be included in |
| andrewbonney | 0:ec559500a63f | 13 | all copies or substantial portions of the Software. |
| andrewbonney | 0:ec559500a63f | 14 | |
| andrewbonney | 0:ec559500a63f | 15 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
| andrewbonney | 0:ec559500a63f | 16 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
| andrewbonney | 0:ec559500a63f | 17 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
| andrewbonney | 0:ec559500a63f | 18 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
| andrewbonney | 0:ec559500a63f | 19 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
| andrewbonney | 0:ec559500a63f | 20 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
| andrewbonney | 0:ec559500a63f | 21 | THE SOFTWARE. |
| andrewbonney | 0:ec559500a63f | 22 | */ |
| andrewbonney | 0:ec559500a63f | 23 | |
| andrewbonney | 0:ec559500a63f | 24 | #include "RPCHandler.h" |
| andrewbonney | 0:ec559500a63f | 25 | #include "rpc.h" |
| andrewbonney | 0:ec559500a63f | 26 | #include "url.h" |
| andrewbonney | 0:ec559500a63f | 27 | |
| andrewbonney | 0:ec559500a63f | 28 | //#define __DEBUG |
| andrewbonney | 0:ec559500a63f | 29 | #include "dbg/dbg.h" |
| andrewbonney | 0:ec559500a63f | 30 | |
| andrewbonney | 0:ec559500a63f | 31 | #define RPC_DATA_LEN 128 |
| andrewbonney | 0:ec559500a63f | 32 | |
| andrewbonney | 0:ec559500a63f | 33 | RPCHandler::RPCHandler(const char* rootPath, const char* path, TCPSocket* pTCPSocket) : HTTPRequestHandler(rootPath, path, pTCPSocket) |
| andrewbonney | 0:ec559500a63f | 34 | {} |
| andrewbonney | 0:ec559500a63f | 35 | |
| andrewbonney | 0:ec559500a63f | 36 | RPCHandler::~RPCHandler() |
| andrewbonney | 0:ec559500a63f | 37 | { |
| andrewbonney | 0:ec559500a63f | 38 | DBG("\r\nHandler destroyed\r\n"); |
| andrewbonney | 0:ec559500a63f | 39 | } |
| andrewbonney | 0:ec559500a63f | 40 | |
| andrewbonney | 0:ec559500a63f | 41 | void RPCHandler::doGet() |
| andrewbonney | 0:ec559500a63f | 42 | { |
| andrewbonney | 0:ec559500a63f | 43 | DBG("\r\nIn RPCHandler::doGet()\r\n"); |
| andrewbonney | 0:ec559500a63f | 44 | char resp[RPC_DATA_LEN] = {0}; |
| andrewbonney | 0:ec559500a63f | 45 | char req[RPC_DATA_LEN] = {0}; |
| andrewbonney | 0:ec559500a63f | 46 | |
| andrewbonney | 0:ec559500a63f | 47 | DBG("\r\nPath : %s\r\n", path().c_str()); |
| andrewbonney | 0:ec559500a63f | 48 | DBG("\r\nRoot Path : %s\r\n", rootPath().c_str()); |
| andrewbonney | 0:ec559500a63f | 49 | |
| andrewbonney | 0:ec559500a63f | 50 | //Remove path |
| andrewbonney | 0:ec559500a63f | 51 | strncpy(req, path().c_str(), RPC_DATA_LEN-1); |
| andrewbonney | 0:ec559500a63f | 52 | DBG("\r\nRPC req : %s\r\n", req); |
| andrewbonney | 0:ec559500a63f | 53 | |
| andrewbonney | 0:ec559500a63f | 54 | //Remove %20, +, from req |
| andrewbonney | 0:ec559500a63f | 55 | cleanReq(req); |
| andrewbonney | 0:ec559500a63f | 56 | DBG("\r\nRPC req : %s\r\n", req); |
| andrewbonney | 0:ec559500a63f | 57 | |
| andrewbonney | 0:ec559500a63f | 58 | //Do RPC Call |
| andrewbonney | 0:ec559500a63f | 59 | mbed::rpc(req, resp); //FIXME: Use bool result |
| andrewbonney | 0:ec559500a63f | 60 | |
| andrewbonney | 0:ec559500a63f | 61 | //Response |
| andrewbonney | 0:ec559500a63f | 62 | setContentLen( strlen(resp) ); |
| andrewbonney | 0:ec559500a63f | 63 | |
| andrewbonney | 0:ec559500a63f | 64 | //Make sure that the browser won't cache this request |
| andrewbonney | 0:ec559500a63f | 65 | respHeaders()["Cache-control"]="no-cache;no-store"; |
| andrewbonney | 0:ec559500a63f | 66 | // respHeaders()["Cache-control"]="no-store"; |
| andrewbonney | 0:ec559500a63f | 67 | respHeaders()["Pragma"]="no-cache"; |
| andrewbonney | 0:ec559500a63f | 68 | respHeaders()["Expires"]="0"; |
| andrewbonney | 0:ec559500a63f | 69 | |
| andrewbonney | 0:ec559500a63f | 70 | //Write data |
| andrewbonney | 0:ec559500a63f | 71 | respHeaders()["Connection"] = "close"; |
| andrewbonney | 0:ec559500a63f | 72 | writeData(resp, strlen(resp)); |
| andrewbonney | 0:ec559500a63f | 73 | DBG("\r\nExit RPCHandler::doGet()\r\n"); |
| andrewbonney | 0:ec559500a63f | 74 | } |
| andrewbonney | 0:ec559500a63f | 75 | |
| andrewbonney | 0:ec559500a63f | 76 | void RPCHandler::doPost() |
| andrewbonney | 0:ec559500a63f | 77 | { |
| andrewbonney | 0:ec559500a63f | 78 | |
| andrewbonney | 0:ec559500a63f | 79 | } |
| andrewbonney | 0:ec559500a63f | 80 | |
| andrewbonney | 0:ec559500a63f | 81 | void RPCHandler::doHead() |
| andrewbonney | 0:ec559500a63f | 82 | { |
| andrewbonney | 0:ec559500a63f | 83 | |
| andrewbonney | 0:ec559500a63f | 84 | } |
| andrewbonney | 0:ec559500a63f | 85 | |
| andrewbonney | 0:ec559500a63f | 86 | |
| andrewbonney | 0:ec559500a63f | 87 | void RPCHandler::onReadable() //Data has been read |
| andrewbonney | 0:ec559500a63f | 88 | { |
| andrewbonney | 0:ec559500a63f | 89 | |
| andrewbonney | 0:ec559500a63f | 90 | } |
| andrewbonney | 0:ec559500a63f | 91 | |
| andrewbonney | 0:ec559500a63f | 92 | void RPCHandler::onWriteable() //Data has been written & buf is free |
| andrewbonney | 0:ec559500a63f | 93 | { |
| andrewbonney | 0:ec559500a63f | 94 | DBG("\r\nRPCHandler::onWriteable() event\r\n"); |
| andrewbonney | 0:ec559500a63f | 95 | close(); //Data written, we can close the connection |
| andrewbonney | 0:ec559500a63f | 96 | } |
| andrewbonney | 0:ec559500a63f | 97 | |
| andrewbonney | 0:ec559500a63f | 98 | void RPCHandler::onClose() //Connection is closing |
| andrewbonney | 0:ec559500a63f | 99 | { |
| andrewbonney | 0:ec559500a63f | 100 | //Nothing to do |
| andrewbonney | 0:ec559500a63f | 101 | } |
| andrewbonney | 0:ec559500a63f | 102 | |
| andrewbonney | 0:ec559500a63f | 103 | void RPCHandler::cleanReq(char* data) |
| andrewbonney | 0:ec559500a63f | 104 | { |
| andrewbonney | 0:ec559500a63f | 105 | char* decoded = url_decode(data); |
| andrewbonney | 0:ec559500a63f | 106 | strcpy(data, decoded); |
| andrewbonney | 0:ec559500a63f | 107 | free(decoded); |
| andrewbonney | 0:ec559500a63f | 108 | /* |
| andrewbonney | 0:ec559500a63f | 109 | char* p; |
| andrewbonney | 0:ec559500a63f | 110 | static const char* lGarbage[2] = {"%20", "+"}; |
| andrewbonney | 0:ec559500a63f | 111 | for(int i = 0; i < 2; i++) |
| andrewbonney | 0:ec559500a63f | 112 | { |
| andrewbonney | 0:ec559500a63f | 113 | while( p = strstr(data, lGarbage[i]) ) |
| andrewbonney | 0:ec559500a63f | 114 | { |
| andrewbonney | 0:ec559500a63f | 115 | memset((void*) p, ' ', strlen(lGarbage[i])); |
| andrewbonney | 0:ec559500a63f | 116 | } |
| andrewbonney | 0:ec559500a63f | 117 | } |
| andrewbonney | 0:ec559500a63f | 118 | */ |
| andrewbonney | 0:ec559500a63f | 119 | } |
| andrewbonney | 0:ec559500a63f | 120 | |
| andrewbonney | 0:ec559500a63f | 121 |