Commit a6060533 authored by jan.koester's avatar jan.koester
Browse files

use new netapi

parent d68152c8

examples/httpclient.cpp

+4 −4
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ int main(int argc, char** argv){ 
  netplus::tcp cltsock;

  netplus::tcp srvsock(argv[1],atoi(argv[2]),1,0);

  try{

    srvsock.connect(&cltsock);

    srvsock.connect(cltsock);



    try{

      libhttppp::HttpRequest req;
@@ -95,14 +95,14 @@ int main(int argc, char** argv){ 
      *req.setData("host") << argv[1] << ":" << argv[2];

      *req.setData("accept") << "text/html";

      *req.setData("user-agent") << "libhttppp/1.0 (Alpha Version 0.1)";

      req.send(&cltsock,&srvsock);

      req.send(cltsock,srvsock);

    }catch(libhttppp::HTTPException &e){

      std::cerr << e.what() << std::endl;

      return -1;

    }



    char data[16384];

    size_t recv=srvsock.recvData(&cltsock,data,16384);

    size_t recv=srvsock.recvData(cltsock,data,16384);



    std::string html;

    libhttppp::HttpResponse res;
@@ -128,7 +128,7 @@ int main(int argc, char** argv){ 
        html.append(data+hsize,recv-hsize);

        rlen-=recv-hsize;

        if(rlen>0){

          recv=srvsock.recvData(&cltsock,data,16384);

          recv=srvsock.recvData(cltsock,data,16384);

          hsize=0;

        }

      }while(rlen>0);

src/http.cpp

+3 −3
Original line number Diff line number Diff line
@@ -646,15 +646,15 @@ void libhttppp::HttpRequest::setRequestVersion(const char* version){ 
}





void libhttppp::HttpRequest::send(netplus::socket* src,netplus::socket* dest){

void libhttppp::HttpRequest::send(netplus::socket& src,netplus::socket& dest){

  std::string header;

  printHeader(header);



  try {

    size_t send=dest->sendData(src,(void*)header.c_str(),header.length());

    size_t send=dest.sendData(src,(void*)header.c_str(),header.length());



    while(send<_Request.length()){

      send+=dest->sendData(src,(void*)_Request.substr(send,_Request.length()-send).c_str(),

      send+=dest.sendData(src,(void*)_Request.substr(send,_Request.length()-send).c_str(),

                          _Request.length()-send);

    }

  }catch(netplus::NetException &e){

src/http.h

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ namespace libhttppp { 
    void           setRequestVersion(const char *version);

    /*only for post Reuquesttype*/

    void           setRequestData(const char *data,size_t len);

    void           send(netplus::socket* src,netplus::socket* dest);

    void           send(netplus::socket& src,netplus::socket& dest);

  private:

    std::string    _Request;

    int            _RequestType;