Module: kamailio Branch: master Commit: 06b99df0a6e9faa82cd53f2f51ea481277f28fe3 URL: https://github.com/kamailio/kamailio/commit/06b99df0a6e9faa82cd53f2f51ea4812...
Author: Daniel-Constantin Mierla miconda@gmail.com Committer: Daniel-Constantin Mierla miconda@gmail.com Date: 2021-08-30T09:00:30+02:00
secsipid: define values for mode parameter of internal function
---
Modified: src/modules/secsipid/secsipid_mod.c Modified: src/modules/secsipid/secsipid_papi.h
---
Diff: https://github.com/kamailio/kamailio/commit/06b99df0a6e9faa82cd53f2f51ea4812... Patch: https://github.com/kamailio/kamailio/commit/06b99df0a6e9faa82cd53f2f51ea4812...
---
diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 27216e1cec..3ba76a8827 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -382,6 +382,10 @@ static int w_secsipid_check(sip_msg_t *msg, char *pidentity, char *pkeypath) return ki_secsipid_check(msg, &sidentity, &keypath); }
+#define SECSIPID_MODE_VALHDR (1<<0) +#define SECSIPID_MODE_VALVAR (1<<1) +#define SECSIPID_MODE_KEYPATH (1<<2) +#define SECSIPID_MODE_KEYDATA (1<<3)
/** * @@ -404,7 +408,7 @@ static int ki_secsipid_add_identity_mode(sip_msg_t *msg, str *origtn, str *destt ibody.len = _secsipid_papi.SecSIPIDGetIdentity(origtn->s, desttn->s, attest->s, origid->s, x5u->s, keypath->s, &ibody.s);
- if(mode==1) { + if(mode&SECSIPID_MODE_VALVAR) { _secsipid_data.ret = ibody.len; }
@@ -415,7 +419,7 @@ static int ki_secsipid_add_identity_mode(sip_msg_t *msg, str *origtn, str *destt
LM_DBG("identity value: %.*s\n", ibody.len, ibody.s);
- if(mode==1) { + if(mode&SECSIPID_MODE_VALVAR) { if(_secsipid_data.value.s) { free(_secsipid_data.value.s); } @@ -470,7 +474,8 @@ static int ki_secsipid_add_identity(sip_msg_t *msg, str *origtn, str *desttn, str *attest, str *origid, str *x5u, str *keypath) { return ki_secsipid_add_identity_mode(msg, origtn, desttn, - attest, origid, x5u, keypath, 0); + attest, origid, x5u, keypath, + SECSIPID_MODE_VALHDR|SECSIPID_MODE_KEYPATH); }
/** @@ -512,7 +517,8 @@ static int w_secsipid_add_identity(sip_msg_t *msg, char *porigtn, char *pdesttn, }
return ki_secsipid_add_identity_mode(msg, &origtn, &desttn, - &attest, &origid, &x5u, &keypath, 0); + &attest, &origid, &x5u, &keypath, + SECSIPID_MODE_VALHDR|SECSIPID_MODE_KEYPATH); }
/** @@ -527,7 +533,8 @@ static int ki_secsipid_build_identity(sip_msg_t *msg, str *origtn, str *desttn, memset(&_secsipid_data, 0, sizeof(secsipid_data_t));
return ki_secsipid_add_identity_mode(msg, origtn, desttn, - attest, origid, x5u, keypath, 1); + attest, origid, x5u, keypath, + SECSIPID_MODE_VALVAR|SECSIPID_MODE_KEYPATH); }
/** @@ -574,7 +581,8 @@ static int w_secsipid_build_identity(sip_msg_t *msg, char *porigtn, char *pdestt }
return ki_secsipid_add_identity_mode(msg, &origtn, &desttn, - &attest, &origid, &x5u, &keypath, 1); + &attest, &origid, &x5u, &keypath, + SECSIPID_MODE_VALVAR|SECSIPID_MODE_KEYPATH); }
/** diff --git a/src/modules/secsipid/secsipid_papi.h b/src/modules/secsipid/secsipid_papi.h index 657f5b9cc7..d96a515ba3 100644 --- a/src/modules/secsipid/secsipid_papi.h +++ b/src/modules/secsipid/secsipid_papi.h @@ -31,6 +31,9 @@ typedef struct secsipid_papi { int (*SecSIPIDGetIdentity)(char* origTN, char* destTN, char* attestVal, char* origID, char* x5uVal, char* prvkeyPath, char** outPtr);
+ int (*SecSIPIDGetIdentityPrvKey)(char* origTN, char* destTN, char* attestVal, + char* origID, char* x5uVal, char* prvkeyData, char** outPtr); + int (*SecSIPIDCheck)(char* identityVal, int identityLen, int expireVal, char* pubkeyPath, int timeoutVal);
-
Daniel-Constantin Mierla