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

use new net api

parent 471d9e7d

plugins/nginxfiler/filer.cpp

+4 −5
Original line number Diff line number Diff line
@@ -159,11 +159,12 @@ namespace blogi { 


            path+="/";



            netplus::tcp *srvsock=nullptr;

            netplus::socket *cltsock=new netplus::tcp();

            std::shared_ptr<netplus::tcp> srvsock;

            std::shared_ptr<netplus::socket> cltsock;

            try{

                try{

                    srvsock= new netplus::tcp(_NHost.c_str(),_NPort,1,0);

                    srvsock=std::make_shared<netplus::tcp>(_NHost.c_str(),_NPort,1,0);

                    cltsock=std::make_shared<netplus::tcp>();

                    srvsock->setnonblocking();

                    srvsock->connect(cltsock);

                    cltsock->setnonblocking();
@@ -352,8 +353,6 @@ namespace blogi { 
                curres.setState(HTTP500);

                curres.send(curcon, e.what(),strlen(e.what()));

            }

            delete cltsock;

            delete srvsock;

            return true;

        }

    private:

plugins/youtube/youtube.cpp

+9 −7
Original line number Diff line number Diff line
@@ -141,9 +141,11 @@ namespace blogi { 
            int rlen=0;



            try{

                netplus::ssl ysock("www.googleapis.com",443,1,0,GOOGLECA,1966),ycsock;

                ysock.connect(&ycsock);

                ycsock.setnonblocking();

                std::shared_ptr<netplus::ssl> ysock=std::make_shared<netplus::ssl>("www.googleapis.com",443,1,0,GOOGLECA,1966);

		std::shared_ptr<netplus::ssl> ycsock=std::make_shared<netplus::ssl>();

                

                ysock->connect(ycsock);

                ycsock->setnonblocking();



                for(auto channel : channels){

                    libhttppp::HttpRequest nreq;
@@ -156,13 +158,13 @@ namespace blogi { 
                    *nreq.setData("host")  << "www.googleapis.com" << ":" << 443;

                    *nreq.setData("accept") << "text/json";

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

                    nreq.send(&ycsock,&ysock);

                    nreq.send(ycsock,ysock);



                    char data[16384];

                    int recv,tries=0,chunklen=0;

                    try{

                        for(;;){

                            recv=ysock.recvData(&ycsock,data,16384);

                            recv=ysock->recvData(ycsock,data,16384);

                            if(recv>0)

                                break;

                            // if(tries>5){
@@ -209,7 +211,7 @@ namespace blogi { 
                                    tries=0;

                                    for(;;){

                                        cpos=0;

                                        recv=ysock.recvData(&ycsock,data,16384);

                                        recv=ysock->recvData(ycsock,data,16384);

                                        if(recv>0)

                                            break;

                                        // if(tries>5){
@@ -251,7 +253,7 @@ namespace blogi { 
                                try{

                                    tries=0;

                                    for(;;){

                                        recv=ysock.recvData(&ycsock,data,16384);

                                        recv=ysock->recvData(ycsock,data,16384);

                                        cpos=0;

                                        if(recv == 0 && tries>10){

                                            netplus::NetException e;

src/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ add_library(blogidev STATIC 
target_link_libraries(blogidev

    htmlpp

    httppp

    cryptplus

    netplus

    uuid

    secureid

src/blogi.cpp

+0 −2
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
#include <netplus/eventapi.h>

#include <netplus/exception.h>



#include <cryptplus/cryptplus.h>



#include <httppp/exception.h>

#include <httppp/http.h>

#include <httppp/httpd.h>