hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Uncrustify maxscale

Browse Source 
See script directory for method. The script to run in the top level
MaxScale directory is called maxscale-uncrustify.sh, which uses
another script, list-src, from the same directory (so you need to set
your PATH). The uncrustify version was 0.66.
This commit is contained in:
Niclas Antti
2018-09-09 22:26:19 +03:00
parent fa7ec95069
commit c447e5cf15
849 changed files with 35002 additions and 27238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
maxscale-system-test/maxinfo_func.cpp
View File

@ -1,4 +1,3 @@
#include <iostream>
#include <unistd.h>
#include "testconnections.h"
@ -18,7 +17,7 @@
using namespace std;
#define PORT 8080
#define PORT 8080
#define USERAGENT "HTMLGET 1.1"
int create_tcp_socket()
@ -32,18 +31,18 @@ int create_tcp_socket()
return sock;
}
char *get_ip(char *host)
char* get_ip(char* host)
{
struct hostent *hent;
int iplen = 16; //XXX.XXX.XXX.XXX
char *ip = (char *)malloc(iplen + 1);
struct hostent* hent;
int iplen = 16; // XXX.XXX.XXX.XXX
char* ip = (char*)malloc(iplen + 1);
memset(ip, 0, iplen + 1);
if ((hent = gethostbyname(host)) == NULL)
{
herror("Can't get IP");
return NULL;
}
if (inet_ntop(AF_INET, (void *)hent->h_addr_list[0], ip, iplen) == NULL)
if (inet_ntop(AF_INET, (void*)hent->h_addr_list[0], ip, iplen) == NULL)
{
perror("Can't resolve host");
return NULL;
@ -51,29 +50,29 @@ char *get_ip(char *host)
return ip;
}
char *build_get_query(char *host, const char *page)
char* build_get_query(char* host, const char* page)
{
char *query;
const char *getpage = page;
char *tpl = (char *) "GET /%s HTTP/1.1\r\nHost: %s\r\nUser-Agent: %s\r\n\r\n";
char* query;
const char* getpage = page;
char* tpl = (char*) "GET /%s HTTP/1.1\r\nHost: %s\r\nUser-Agent: %s\r\n\r\n";
if (getpage[0] == '/')
{
getpage = getpage + 1;
fprintf(stderr, "Removing leading \"/\", converting %s to %s\n", page, getpage);
}
// -5 is to consider the %s %s %s in tpl and the ending \0
query = (char *)malloc(strlen(host) + strlen(getpage) + strlen(USERAGENT) + strlen(tpl) - 5);
query = (char*)malloc(strlen(host) + strlen(getpage) + strlen(USERAGENT) + strlen(tpl) - 5);
sprintf(query, tpl, getpage, host, USERAGENT);
return query;
}
char * get_maxinfo(const char * page, TestConnections* Test)
char* get_maxinfo(const char* page, TestConnections* Test)
{
struct sockaddr_in *remote;
struct sockaddr_in* remote;
int sock;
int tmpres;
char *ip;
char *get;
char* ip;
char* get;
char buf[BUFSIZ + 1];
sock = create_tcp_socket();
@ -83,10 +82,10 @@ char * get_maxinfo(const char * page, TestConnections* Test)
Test->add_result(1, "Can't get IP\n");
return NULL;
}
remote = (struct sockaddr_in *)malloc(sizeof(struct sockaddr_in *));
remote = (struct sockaddr_in*)malloc(sizeof(struct sockaddr_in*));
remote->sin_family = AF_INET;
tmpres = inet_pton(AF_INET, ip, (void *)(&(remote->sin_addr.s_addr)));
if ( tmpres < 0)
tmpres = inet_pton(AF_INET, ip, (void*)(&(remote->sin_addr.s_addr)));
if (tmpres < 0)
{
Test->add_result(1, "Can't set remote->sin_addr.s_addr\n");
return NULL;
@ -98,15 +97,15 @@ char * get_maxinfo(const char * page, TestConnections* Test)
}
remote->sin_port = htons(PORT);
if (connect(sock, (struct sockaddr *)remote, sizeof(struct sockaddr)) < 0)
if (connect(sock, (struct sockaddr*)remote, sizeof(struct sockaddr)) < 0)
{
Test->add_result(1, "Could not connect\n");
return NULL;
}
get = build_get_query(Test->maxscales->IP[0], page);
//Test->tprintf("Query is:\n<<START>>\n%s<<END>>\n", get);
// Test->tprintf("Query is:\n<<START>>\n%s<<END>>\n", get);
//Send the query to the server
// Send the query to the server
size_t sent = 0;
while (sent < strlen(get))
{
@ -118,7 +117,7 @@ char * get_maxinfo(const char * page, TestConnections* Test)
}
sent += tmpres;
}
//now it is time to receive the page
// now it is time to receive the page
memset(buf, 0, sizeof(buf));
char* result = (char*)calloc(BUFSIZ, sizeof(char));
@ -141,7 +140,7 @@ char * get_maxinfo(const char * page, TestConnections* Test)
free(ip);
close(sock);
char * content = strstr(result, "[");
char* content = strstr(result, "[");
if (content == NULL)
{
Test->add_result(1, "Content not found\n");
@ -149,33 +148,33 @@ char * get_maxinfo(const char * page, TestConnections* Test)
return NULL;
}
char * ret_content = (char*) calloc(strlen(content) + 1, sizeof(char));
char* ret_content = (char*) calloc(strlen(content) + 1, sizeof(char));
mempcpy(ret_content, content, strlen(content));
free(result);
return ret_content;
//return(result);
// return(result);
}
char * read_sc(int sock)
char* read_sc(int sock)
{
char buf[BUFSIZ + 1];
int tmpres;
memset(buf, 0, sizeof(buf));
char *result = (char*)calloc(BUFSIZ, sizeof(char));
char* result = (char*)calloc(BUFSIZ, sizeof(char));
size_t rsize = sizeof(buf);
while ((tmpres = recv(sock, buf, BUFSIZ, 0)) > 0)
{
result = (char*)realloc(result, tmpres + rsize);
rsize += tmpres;
//printf("%s", buf);
// printf("%s", buf);
strcat(result, buf);
memset(buf, 0, tmpres);
}
return result;
}
int send_so(int sock, char * data)
int send_so(int sock, char* data)
{
int tmpres;
size_t sent = 0;
@ -191,9 +190,9 @@ int send_so(int sock, char * data)
return 0;
}
static char * bin2hex(const unsigned char *old, const size_t oldlen)
static char* bin2hex(const unsigned char* old, const size_t oldlen)
{
char *result = (char*) malloc(oldlen * 2 + 1);
char* result = (char*) malloc(oldlen * 2 + 1);
size_t i, j;
for (i = j = 0; i < oldlen; i++)
@ -205,29 +204,29 @@ static char * bin2hex(const unsigned char *old, const size_t oldlen)
return result;
}
char * cdc_auth_srt(char * user, char * password)
char* cdc_auth_srt(char* user, char* password)
{
unsigned char sha1pass[20];
char * str;
char* str;
str = (char*) malloc(42 + strlen(user) * 2);
unsigned char *password_u;
unsigned char *user_u;
unsigned char* password_u;
unsigned char* user_u;
password_u = (unsigned char*) malloc(strlen(password));
user_u = (unsigned char*) malloc(strlen(user));
user_u = (unsigned char*) malloc(strlen(user));
memcpy((void*)password_u, (void*)password, strlen(password));
memcpy((void*)user_u, (void*)user, strlen(user));
SHA1(password_u, strlen(password), sha1pass);
//char * sha1pass_hex = (char *) "454ac34c2999aacfebc6bf5fe9fa1db9b596f625";
// char * sha1pass_hex = (char *) "454ac34c2999aacfebc6bf5fe9fa1db9b596f625";
char * sha1pass_hex = bin2hex(sha1pass, 20);
char* sha1pass_hex = bin2hex(sha1pass, 20);
printf("password %s, len %lu, password sha1: %s\n", password, strlen(password), sha1pass_hex);
char * user_hex = bin2hex(user_u, strlen(user));
char * clmn_hex = bin2hex((unsigned char*)":", 1);
char* user_hex = bin2hex(user_u, strlen(user));
char* clmn_hex = bin2hex((unsigned char*)":", 1);
sprintf(str, "%s%s%s", user_hex, clmn_hex, sha1pass_hex);
@ -239,7 +238,6 @@ char * cdc_auth_srt(char * user, char * password)
printf("%s\n", str);
return str;
}
int setnonblocking(int sock)
@ -259,36 +257,36 @@ int setnonblocking(int sock)
}
int get_x_fl_from_json(char * line, long long int * x1, long long int * fl)
int get_x_fl_from_json(char* line, long long int* x1, long long int* fl)
{
json_t *root;
json_t* root;
json_error_t error;
root = json_loads( line, 0, &error );
if ( !root )
root = json_loads(line, 0, &error);
if (!root)
{
fprintf( stderr, "error: on line %d: %s\n", error.line, error.text );
fprintf(stderr, "error: on line %d: %s\n", error.line, error.text);
return 1;
}
json_t * x_json = json_object_get(root, "x1");
json_t* x_json = json_object_get(root, "x1");
if (x_json == NULL)
{
return 1;
}
if ( !json_is_integer(x_json) )
if (!json_is_integer(x_json))
{
printf("x1 is not int, type is %d\n", json_typeof(x_json));
return 1;
}
*x1 = json_integer_value(x_json);
json_t * fl_json = json_object_get(root, "fl");
json_t* fl_json = json_object_get(root, "fl");
if (fl_json == NULL)
{
return 1;
}
if ( !json_is_integer(fl_json) )
if (!json_is_integer(fl_json))
{
printf("fl is not int\n");
return 1;