From e33dd5bd7e18e7f054904d551edac90ce50dd320 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Wed, 16 Feb 2011 12:10:44 +0100 Subject: [PATCH] some cleanup in AmUtils. --- core/AmConfigReader.cpp | 32 +++ core/AmUtils.cpp | 312 +------------------------- core/AmUtils.h | 114 +--------- core/plug-in/stats/StatsUDPServer.cpp | 45 ++++ 4 files changed, 80 insertions(+), 423 deletions(-) diff --git a/core/AmConfigReader.cpp b/core/AmConfigReader.cpp index 8c29e4a0..9f8826ac 100644 --- a/core/AmConfigReader.cpp +++ b/core/AmConfigReader.cpp @@ -42,6 +42,38 @@ while( IS_SPACE(*s) ) s++; \ }while(false) +static int fifo_get_line(FILE* fifo_stream, char* str, size_t len) +{ + char c; + size_t l; + char* s=str; + + if(!len) + return 0; + + l=len; + + while( l && (c=fgetc(fifo_stream)) && !ferror(fifo_stream) && c!=EOF && c!='\n' ){ + if(c!='\r'){ + *(s++) = c; + l--; + } + } + + + if(l>0){ + // We need one more character + // for trailing '\0'. + *s='\0'; + + return int(s-str); + } + else + // buffer overran. + return -1; +} + + int AmConfigReader::loadFile(const string& path) { FILE* fp = fopen(path.c_str(),"r"); diff --git a/core/AmUtils.cpp b/core/AmUtils.cpp index ebb533d8..f9b59e70 100644 --- a/core/AmUtils.cpp +++ b/core/AmUtils.cpp @@ -53,21 +53,6 @@ #include -#ifndef UNIX_PATH_MAX -#define UNIX_PATH_MAX 104 -#endif - -// timeout in us (ms/1000) -#define SER_WRITE_TIMEOUT 250000 // 250 ms -// write retry interval in us -#define SER_WRITE_INTERVAL 50000 // 50 ms - -// timeout in us (ms/1000) -#define SER_SIPREQ_TIMEOUT 5*60*1000*1000 // 5 minutes -#define SER_DBREQ_TIMEOUT 250000 // 250 ms -// read retry interval in us -#define SER_READ_INTERVAL 50000 // 50 ms - static char _int2str_lookup[] = { '0', '1', '2', '3', '4', '5', '6' , '7', '8', '9' }; @@ -433,142 +418,6 @@ int parse_return_code(const char* lbuf, unsigned int& res_code, string& res_msg return -1; } -int fifo_get_line(FILE* fifo_stream, char* str, size_t len) -{ - char c; - size_t l; - char* s=str; - - if(!len) - return 0; - - l=len; - - while( l && (c=fgetc(fifo_stream)) && !ferror(fifo_stream) && c!=EOF && c!='\n' ){ - if(c!='\r'){ - *(s++) = c; - l--; - } - } - - - if(l>0){ - // We need one more character - // for trailing '\0'. - *s='\0'; - - return int(s-str); - } - else - // buffer overran. - return -1; -} - -int fifo_get_lines(FILE* fifo_stream, char* str, size_t len) -{ - int l=0,max=len; - char* s=str; - - if(!len) - return 0; - - while( max>0 && (l=fifo_get_line(fifo_stream,s,max)) && l!=-1 ) { - if(!strcmp(".",s)) - break; - s+=l; - *(s++)='\n'; - max-=l+1; - } - - s[0]='\0'; - - return (l!=-1 ? s-str : -1); -} - -int fifo_get_param(FILE* fp, string& p, char* line_buf, unsigned int size) -{ - if( fifo_get_line(fp,line_buf,size) !=-1 ){ - if(!strcmp(".",line_buf)) - line_buf[0]='\0'; - - p = line_buf; - } - else { - ERROR("could not read from FIFO: %s\n",strerror(errno)); - return -1; - } - - return 0; -} - -int msg_get_line(char*& msg_c, char* str, size_t len) -{ - size_t l; - char* s=str; - - if(!len) - return 0; - - for(l=len; l && (*msg_c) && (*msg_c !='\n'); msg_c++ ){ - *(s++) = *msg_c; - l--; - } - - if(*msg_c) - msg_c++; - - if(l>0){ - // We need one more character - // for trailing '\0'. - *s='\0'; - - return int(s-str); - } - else { - ERROR("buffer too small (size=%u)\n",(unsigned int)len); - // buffer overran. - return -1; - } -} - -int msg_get_lines(char*& msg_c, char* str, size_t len) -{ - int l=0,max=len; - char* s=str; - - if(!len) - return 0; - - while( max>0 && (l=msg_get_line(msg_c,s,max)) && l!=-1 ) { - if(!strcmp(".",s) || !strcmp("\r",s)) - break; - s+=l; - *(s++)='\n'; - max-=l+1; - } - - s[0]='\0'; - - return (l!=-1 ? s-str : -1); -} - -int msg_get_param(char*& msg_c, string& p, char* line_buf, unsigned int size) -{ - if( msg_get_line(msg_c,line_buf,size) != -1 ){ - - if(!strcmp(".",line_buf)) - line_buf[0]='\0'; - - p = line_buf; - } - else { - ERROR("msg_get_line failed\n"); - return -1; - } - - return 0; -} - bool file_exists(const string& name) { FILE* test_fp = fopen(name.c_str(),"r"); @@ -589,87 +438,12 @@ string filename_from_fullpath(const string& path) string get_addr_str(struct in_addr in) { - char res[46]; // INET6_ADDRSTRLEN - if (inet_ntop(AF_INET, &in, res, 46)) + char res[INET_ADDRSTRLEN]; + if (inet_ntop(AF_INET, &in, res, INET_ADDRSTRLEN)) return string(res); else return ""; } -AmMutex inet_gethostbyname; -string get_ip_from_name(const string& name) -{ - inet_gethostbyname.lock(); - struct hostent *he = gethostbyname(name.c_str()); - if(!he){ - inet_gethostbyname.unlock(); - return ""; - } - struct in_addr a; - bcopy(he->h_addr, (char *) &a, sizeof(a)); - inet_gethostbyname.unlock(); - return get_addr_str(a); -} - -/* Takes a string representation of an IP address, or an FQDN, - * and populates the provided struct sockaddr_in (similar to - * inet_aton). - * Returns the hostent for the input, or NULL on failure. - * Almost certainly won't work with IPv6 addresses. - */ -int populate_sockaddr_in_from_name(const string& name, struct sockaddr_in *sa) { - - if (NULL == sa) { - return 0; - } - - int res = 0; - struct addrinfo hints; - struct addrinfo *result, *rp; - memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_family = AF_INET; // AF_UNSPEC for IPv4 or IPv6 - hints.ai_socktype = SOCK_DGRAM; // Datagram socket. - hints.ai_flags = AI_ADDRCONFIG; - hints.ai_protocol = 0; // Any protocol. - - int s = getaddrinfo(name.c_str(), NULL, &hints, &result); - if (s != 0) { - WARN("getaddrinfo failed on %s: %s.\n", - name.c_str(), - gai_strerror(s)); - return res; - } - - for (rp = result; rp != NULL; rp = rp->ai_next) { - if ((rp->ai_addrlen != sizeof(struct sockaddr_in)) || // Should not happen. - (rp->ai_socktype != SOCK_DGRAM) || - (rp->ai_family != AF_INET)) // TODO: Won't behave with IPv6. - continue; - memcpy(&(sa->sin_addr), - &((struct sockaddr_in *)rp->ai_addr)->sin_addr, - sizeof(sa->sin_addr)); - res = 1; - break; - } - - freeaddrinfo(result); - return res; -} - -string uri_from_name_addr(const string& name_addr) -{ - string uri = name_addr; - string::size_type pos = uri.find('<'); - - if(pos != string::npos) - uri.erase(0,pos+1); - - pos = uri.find('>'); - if(pos != string::npos) - uri.erase(pos,uri.length()-pos); - - return uri; -} - #ifdef SUPPORT_IPV6 #include @@ -766,88 +540,6 @@ string add2path( const string& path, int n_suffix, ...) return outpath; } - -int write_to_fifo(const string& fifo, const char * buf, unsigned int len) -{ - int fd_fifo; - int retry = SER_WRITE_TIMEOUT / SER_WRITE_INTERVAL; - - for(;retry>0; retry--){ - - if((fd_fifo = open(fifo.c_str(), - O_WRONLY | O_NONBLOCK)) == -1) { - ERROR("while opening %s: %s\n", - fifo.c_str(),strerror(errno)); - - if(retry) - sleep_us(50000); - } - else { - break; - } - } - - if(!retry) - return -1; - - DBG("write_to_fifo: <%s>\n",buf); - int l = write(fd_fifo,buf,len); - close(fd_fifo); - - if(l==-1) - ERROR("while writing: %s\n",strerror(errno)); - else - DBG("Write to fifo: completed\n"); - - return l; -} - - -int write_to_socket(int sd, const char* to_addr, const char * buf, unsigned int len) -{ - int retry = SER_WRITE_TIMEOUT / SER_WRITE_INTERVAL; - int ret=-1; - - struct sockaddr_un ser_addr; - memset (&ser_addr, 0, sizeof (ser_addr)); - ser_addr.sun_family = AF_UNIX; - strncpy(ser_addr.sun_path,to_addr,UNIX_PATH_MAX); - - DBG("sending: <%.*s>\n",len,buf); - - for(;retry>0;retry--){ - - if( (sendto(sd,buf,len,MSG_DONTWAIT, - (struct sockaddr*)&ser_addr, - sizeof(struct sockaddr_un)) == -1) ) { - - if(errno == EAGAIN){ - if(retry) - sleep_us(SER_WRITE_INTERVAL); - continue; - } - - ERROR("while sending request to %s: %s\n", - ser_addr.sun_path,strerror(errno)); - goto error; - } - break; - } - - if(!retry){ - ERROR("timeout while sending request to %s\n",ser_addr.sun_path); - goto error; - } - - DBG("write to unix socket: completed\n"); - ret = 0; - - error: - // close(sd); - // return (ret == -1 ? ret : len); - return ret; -} - int get_local_addr_for_dest(sockaddr_storage* remote_ip, sockaddr_storage* local) { int temp_sock = socket(remote_ip->ss_family, SOCK_DGRAM, 0 ); diff --git a/core/AmUtils.h b/core/AmUtils.h index 8db36877..bbcfa71d 100644 --- a/core/AmUtils.h +++ b/core/AmUtils.h @@ -41,7 +41,7 @@ using std::string; #include #include -#define FIFO_PERM S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH +//#define FIFO_PERM S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH #define PARAM_HDR "P-App-Param" #define APPNAME_HDR "P-App-Name" @@ -156,83 +156,6 @@ bool str2long(char*& str, long& result, char sep = ' '); */ int parse_return_code(const char* lbuf, unsigned int& res_code, string& res_msg ); - -/** - * Get a line from a file. - * - * @param fifo_stream file to read from. - * @param str [out] line buffer. - * @param len size of the line buffer. - * - * @return -1 if buffer overruns, - * else the line's length. - */ -int fifo_get_line(FILE* fifo_stream, char* str, size_t len); - -/** - * Gets one or more lines from a file. - * It stops to read as soon as a '.' line - * gets read or encounters EOF. - * - * Syntax: - * "[ - * {one or more lines} - * ] - * ." - * - * @param fifo_stream file to read from. - * @param str [out] line buffer. - * @param len size of the line buffer. - * - * @return -1 if buffer overruns, - * else total length. - */ -int fifo_get_lines(FILE* fifo_stream, char* str, size_t len); - -/** - * Size of line buffer used within fifo_get_param. - */ -//#define MAX_LINE_SIZE 256 - -/** - * Gets a line parameter from file pointer. - * If line only contain '.', the parameter is empty. - * Throws error string if failed. - */ -int fifo_get_param(FILE* fp, string& p, char* line_buf, unsigned int size); - -/** - * Gets a line from the message buffer. - * @param msg_c [in,out] pointer to current message buffer. - * @param str line buffer. - * @param len line buffer size. - * @return size read or -1 if something went wrong. - */ -int msg_get_line(char*& msg_c, char* str, size_t len); - -/** - * Gets [1..n] line(s) from the message buffer. - * @param msg_c [in,out] pointer to current message buffer. - * @param str line buffer. - * @param len line buffer size. - * @return size read or -1 if something went wrong. - */ -int msg_get_lines(char*& msg_c, char* str, size_t len); - -/** - * Size of line buffer used within msg_get_param. - */ -//#define MSG_LINE_SIZE 1024 - -/** - * Gets a line parameter from message buffer. - * If line only contain '.', the parameter is empty. - * Throws error string if failed. - * @param msg_c [in,out] pointer to current message buffer. - * @param p [out] parameter to be filled. - */ -int msg_get_param(char*& msg_c, string& p, char* line_buf, unsigned int size); - /** * Tells if a file exists. * @param name file name. @@ -256,40 +179,9 @@ string file_extension(const string& path); */ string add2path(const string& path, int n_suffix, ...); -/** - * Reads a line from file and stores it in a string. - * @param f file to read from. - * @param p [out] where to store the line. - * @param lb line buffer. - * @param lbs line buffer's size. - */ -#define READ_FIFO_PARAMETER(f,p,lb,lbs)\ - {\ - if( fifo_get_line(f,lb,lbs) !=-1 ){\ - if(!strcmp(".",lb))\ - lb[0]='\0';\ - DBG("%s= <%s>\n",#p,lb);\ - p = lb;\ - }\ - else {\ - throw string("could not read from FIFO: ") + string(strerror(errno));\ - } \ - } - struct in_addr; string get_addr_str(struct in_addr in); -string uri_from_name_addr(const string& name_addr); -string get_ip_from_name(const string& name); - -/* Generalized hostname/IP address handling -- wherever you would use - * inet_aton(addr.c_str(), &sa.sin_addr) - * instead use - * populate_sockaddr_in_from_name(addr, &sa) - */ -int populate_sockaddr_in_from_name(const string& name, - struct sockaddr_in *sa); - #ifdef SUPPORT_IPV6 int inet_aton_v6(const char* name, struct sockaddr_storage* ss); void set_port_v6(struct sockaddr_storage* ss, short port); @@ -305,10 +197,6 @@ short get_port_v6(struct sockaddr_storage* ss); select(0, NULL, NULL, NULL, &tval ); \ } - -int write_to_fifo(const string& fifo, const char * buf, unsigned int len); -int write_to_socket(int sd, const char* to_addr, const char * buf, unsigned int len); - /* * Computes the local address for a specific destination address. * This is done by opening a connected UDP socket and reading the diff --git a/core/plug-in/stats/StatsUDPServer.cpp b/core/plug-in/stats/StatsUDPServer.cpp index 716a2f78..a5613d14 100644 --- a/core/plug-in/stats/StatsUDPServer.cpp +++ b/core/plug-in/stats/StatsUDPServer.cpp @@ -228,7 +228,52 @@ void StatsUDPServer::run() } +static int msg_get_line(char*& msg_c, char* str, size_t len) +{ + size_t l; + char* s=str; + + if(!len) + return 0; + + for(l=len; l && (*msg_c) && (*msg_c !='\n'); msg_c++ ){ + *(s++) = *msg_c; + l--; + } + + if(*msg_c) + msg_c++; + + if(l>0){ + // We need one more character + // for trailing '\0'. + *s='\0'; + + return int(s-str); + } + else { + ERROR("buffer too small (size=%u)\n",(unsigned int)len); + // buffer overran. + return -1; + } +} + +static int msg_get_param(char*& msg_c, string& p, char* line_buf, unsigned int size) +{ + if( msg_get_line(msg_c,line_buf,size) != -1 ){ + + if(!strcmp(".",line_buf)) + line_buf[0]='\0'; + + p = line_buf; + } + else { + ERROR("msg_get_line failed\n"); + return -1; + } + return 0; +} int StatsUDPServer::execute(char* msg_buf, string& reply, struct sockaddr_in& addr)