proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-02 17:42:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add a custom param to git_smart_subtransport_definition

Browse Source 
The smart transport has already take the payload param. For the
sub transport a payload param is useful for the implementer.
This commit is contained in:
Leo Yang 2015-03-17 12:49:33 -04:00
parent bdf0e73450
commit 142e5379ca
7 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/git2/sys/transport.h
View File

@ -289,7 +289,8 @@ struct git_smart_subtransport {
/* A function which creates a new subtransport for the smart transport */
typedef int (*git_smart_subtransport_cb)(
git_smart_subtransport **out,
git_transport* owner);
git_transport* owner,
void* param);
/**
* Definition for a "subtransport"
@ -306,6 +307,10 @@ typedef struct git_smart_subtransport_definition {
* http:// is stateless, but git:// is not.
*/
unsigned rpc;
/** Param of the callback
*/
void* param;
} git_smart_subtransport_definition;
/* Smart transport subtransports that come with libgit2 */
@ -321,7 +326,8 @@ typedef struct git_smart_subtransport_definition {
*/
GIT_EXTERN(int) git_smart_subtransport_http(
git_smart_subtransport **out,
git_transport* owner);
git_transport* owner,
void *param);
/**
* Create an instance of the git subtransport.
@ -332,7 +338,8 @@ GIT_EXTERN(int) git_smart_subtransport_http(
*/
GIT_EXTERN(int) git_smart_subtransport_git(
git_smart_subtransport **out,
git_transport* owner);
git_transport* owner,
void *param);
/**
* Create an instance of the ssh subtransport.
@ -343,7 +350,8 @@ GIT_EXTERN(int) git_smart_subtransport_git(
*/
GIT_EXTERN(int) git_smart_subtransport_ssh(
git_smart_subtransport **out,
git_transport* owner);
git_transport* owner,
void *param);
/**
* Sets a custom transport factory for the remote. The caller can use this

6
src/transport.c
View File

@ -18,10 +18,10 @@ typedef struct transport_definition {
void *param;
} transport_definition;
static git_smart_subtransport_definition http_subtransport_definition = { git_smart_subtransport_http, 1 };
static git_smart_subtransport_definition git_subtransport_definition = { git_smart_subtransport_git, 0 };
static git_smart_subtransport_definition http_subtransport_definition = { git_smart_subtransport_http, 1, NULL };
static git_smart_subtransport_definition git_subtransport_definition = { git_smart_subtransport_git, 0, NULL };
#ifdef GIT_SSH
static git_smart_subtransport_definition ssh_subtransport_definition = { git_smart_subtransport_ssh, 0 };
static git_smart_subtransport_definition ssh_subtransport_definition = { git_smart_subtransport_ssh, 0, NULL };
#endif
static transport_definition local_transport_definition = { "file://", git_transport_local, NULL };

4
src/transports/git.c
View File

@ -340,10 +340,12 @@ static void _git_free(git_smart_subtransport *subtransport)
git__free(t);
}
int git_smart_subtransport_git(git_smart_subtransport **out, git_transport *owner)
int git_smart_subtransport_git(git_smart_subtransport **out, git_transport *owner, void *param)
{
git_subtransport *t;
GIT_UNUSED(param);
if (!out)
return -1;

4
src/transports/http.c
View File

@ -1007,10 +1007,12 @@ static void http_free(git_smart_subtransport *subtransport)
git__free(t);
}
int git_smart_subtransport_http(git_smart_subtransport **out, git_transport *owner)
int git_smart_subtransport_http(git_smart_subtransport **out, git_transport *owner, void *param)
{
http_subtransport *t;
GIT_UNUSED(param);
if (!out)
return -1;

2
src/transports/smart.c
View File

@ -409,7 +409,7 @@ int git_transport_smart(git_transport **out, git_remote *owner, void *param)
return -1;
}
if (definition->callback(&t->wrapped, &t->parent) < 0) {
if (definition->callback(&t->wrapped, &t->parent, definition->param) < 0) {
git__free(t);
return -1;
}

6
src/transports/ssh.c
View File

@ -754,13 +754,15 @@ static int list_auth_methods(int *out, LIBSSH2_SESSION *session, const char *use
#endif
int git_smart_subtransport_ssh(
git_smart_subtransport **out, git_transport *owner)
git_smart_subtransport **out, git_transport *owner, void *param)
{
#ifdef GIT_SSH
ssh_subtransport *t;
assert(out);
GIT_UNUSED(param);
t = git__calloc(sizeof(ssh_subtransport), 1);
GITERR_CHECK_ALLOC(t);
@ -773,6 +775,7 @@ int git_smart_subtransport_ssh(
return 0;
#else
GIT_UNUSED(owner);
GIT_UNUSED(param);
assert(out);
*out = NULL;
@ -793,6 +796,7 @@ int git_transport_ssh_with_paths(git_transport **out, git_remote *owner, void *p
git_smart_subtransport_definition ssh_definition = {
git_smart_subtransport_ssh,
0, /* no RPC */
NULL,
};
if (paths->count != 2) {

4
src/transports/winhttp.c
View File

@ -1322,10 +1322,12 @@ static void winhttp_free(git_smart_subtransport *subtransport)
git__free(t);
}
int git_smart_subtransport_http(git_smart_subtransport **out, git_transport *owner)
int git_smart_subtransport_http(git_smart_subtransport **out, git_transport *owner, void *param)
{
winhttp_subtransport *t;
GIT_UNUSED(param);
if (!out)
return -1;