mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-24 21:35:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add a command line option to set a http proxy (owncloud only)

Browse source
This commit is contained in:
Klaas Freitag 2013-03-05 15:33:14 +01:00
parent 8d43a743a1
commit f211ee8bf1
2 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
client/csync_client.c
View file

@ -57,7 +57,8 @@ at LOCAL with the ones at REMOTE.\n\
#ifdef WITH_ICONV
" --iconv=codec Request charset conversion of local filenames\n"
#endif
" --test-statedb Test creation of the statedb. Runs update\n\
"-p --proxy=<host:port> Use an http proxy (ownCloud module only)\n\
--test-statedb Test creation of the statedb. Runs update\n\
detection.\n\
--test-update Test the update detection\n\
-?, --help Give this help list\n\
@ -80,6 +81,7 @@ static const struct option long_options[] =
{"test-update", no_argument, 0, 0 },
{"version", no_argument, 0, 'V' },
{"usage", no_argument, 0, 'h' },
{"proxy", required_argument, 0, 'p' },
{0, 0, 0, 0}
};
@ -95,6 +97,7 @@ struct argument_s {
int reconcile;
int propagate;
bool with_conflict_copys;
char *http_proxy;
};
static void print_version()
@ -114,7 +117,7 @@ static int parse_args(struct argument_s *csync_args, int argc, char **argv)
while(optind < argc) {
int c = -1;
struct option *opt = NULL;
int result = getopt_long( argc, argv, "dcVh", long_options, &c );
int result = getopt_long( argc, argv, "d:cVhp:", long_options, &c );
if( result == -1 ) {
break;
@ -136,6 +139,11 @@ static int parse_args(struct argument_s *csync_args, int argc, char **argv)
case 'h':
print_help();
break;
case 'p':
if (optarg != NULL) {
csync_args->http_proxy = c_strdup(optarg);
}
break;
case 0:
opt = (struct option*)&(long_options[c]);
if(c_streq(opt->name, "exclude-file")) {
@ -159,6 +167,8 @@ static int parse_args(struct argument_s *csync_args, int argc, char **argv)
} else if(c_streq(opt->name, "iconv")) {
csync_args->iconv = c_strdup(optarg);
/* printf("Argument: iconv\n" ); */
} else if(c_streq(opt->name, "http-proxy")) {
csync_args->http_proxy = c_strdup(optarg);
} else if(c_streq(opt->name, "test-statedb")) {
csync_args->create_statedb = 1;
csync_args->update = 1;
@ -196,6 +206,7 @@ int main(int argc, char **argv) {
arguments.reconcile = 1;
arguments.propagate = 1;
arguments.with_conflict_copys = false;
arguments.http_proxy = NULL;
parse_args(&arguments, argc, argv);
/* two options must remain as source and target */
@ -253,6 +264,23 @@ int main(int argc, char **argv) {
goto out;
}
if (arguments.http_proxy) {
char *host = NULL;
int port = 0;
char *colon;
host = arguments.http_proxy;
colon = strrchr( arguments.http_proxy, ':');
if( colon ) {
port = atoi(colon+1);
*colon = '\0';
}
csync_set_module_property(csync, "proxy_type", (void*) "HttpProxy");
csync_set_module_property(csync, "proxy_host", host);
if( port )
csync_set_module_property(csync, "proxy_port", (void*) &port);
}
if (arguments.exclude_file != NULL) {
if (csync_add_exclude_list(csync, arguments.exclude_file) < 0) {
strerror_r(errno, errbuf, sizeof(errbuf));

8
modules/csync_owncloud.c
View file

@ -1031,18 +1031,10 @@ static struct listdir_context *fetch_resource_list(const char *uri, int depth)
*/
content_type = ne_get_response_header( request, "Content-Type" );
if( !(content_type && c_streq(content_type, "application/xml; charset=utf-8") ) ) {
ssize_t resp_size;
char buffer[4096];
ZERO_STRUCT(buffer);
DEBUG_WEBDAV("ERROR: Content type of propfind request not XML: %s.",
content_type ? content_type: "<empty>");
errno = ERRNO_WRONG_CONTENT;
set_error_message("Server error: PROPFIND reply is not XML formatted!");
/* Read the response buffer to log the actual problem. */
resp_size = ne_read_response_block(request, buffer, 4095);
DEBUG_WEBDAV("ERROR: Content was of size %ld: %s", resp_size, buffer );
ret = NE_CONNECT;
}
}