Skip to content

Commit

Permalink
all: rename pktKey->linkKey and descKey->nodeKey and related stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
Axel Neumann committed Sep 10, 2015
1 parent 0ed1d1b commit 2004658
Show file tree
Hide file tree
Showing 10 changed files with 163 additions and 164 deletions.
28 changes: 14 additions & 14 deletions bmx.c
View file
Expand Up @@ -735,8 +735,8 @@ struct bmx_status {
GLOBAL_ID_T *shortId;
GLOBAL_ID_T *globalId;
char* name;
char *descKey;
char *pktKey;
char *nodeKey;
char *linkKey;
DHASH_T *shortDhash;
DHASH_T *dhash;
char version[(sizeof(BMX_BRANCH) - 1) + (sizeof("-") - 1) + (sizeof(BRANCH_VERSION) - 1) + 1];
Expand All @@ -761,8 +761,8 @@ static const struct field_format bmx_status_format[] = {
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_SHORT_ID, bmx_status, shortId, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_GLOBAL_ID, bmx_status, globalId, 1, FIELD_RELEVANCE_LOW),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_CHAR, bmx_status, name, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_CHAR, bmx_status, descKey, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_CHAR, bmx_status, pktKey, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_CHAR, bmx_status, nodeKey, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_CHAR, bmx_status, linkKey, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_SHORT_ID, bmx_status, shortDhash, 1, FIELD_RELEVANCE_MEDI),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_GLOBAL_ID, bmx_status, dhash, 1, FIELD_RELEVANCE_LOW),
FIELD_FORMAT_INIT(FIELD_TYPE_STRING_CHAR, bmx_status, version, 1, FIELD_RELEVANCE_HIGH),
Expand Down Expand Up @@ -794,8 +794,8 @@ static int32_t bmx_status_creator(struct status_handl *handl, void *data)
status->name = my_Hostname;
status->shortDhash = &myKey->currOrig->descContent->dhn->dhash;
status->dhash = &myKey->currOrig->descContent->dhn->dhash;
status->descKey = (pkm = contents_data(myKey->currOrig->descContent, BMX_DSC_TLV_DSC_PUBKEY)) ? cryptKeyTypeAsString(pkm->type) : DBG_NIL;
status->pktKey = (pkm = contents_data(myKey->currOrig->descContent, BMX_DSC_TLV_PKT_PUBKEY)) ? cryptKeyTypeAsString(pkm->type) : DBG_NIL;
status->nodeKey = (pkm = contents_data(myKey->currOrig->descContent, BMX_DSC_TLV_NODE_PUBKEY)) ? cryptKeyTypeAsString(pkm->type) : DBG_NIL;
status->linkKey = (pkm = contents_data(myKey->currOrig->descContent, BMX_DSC_TLV_LINK_PUBKEY)) ? cryptKeyTypeAsString(pkm->type) : DBG_NIL;
snprintf(status->version, sizeof(status->version), "%s-%s", BMX_BRANCH, BRANCH_VERSION);
status->compat = my_compatibility;
snprintf(status->revision, 8, "%s", GIT_REV);
Expand All @@ -818,6 +818,7 @@ static int32_t bmx_status_creator(struct status_handl *handl, void *data)
struct orig_status {
GLOBAL_ID_T *shortId;
GLOBAL_ID_T *globalId;
char* name;
char *state;
uint16_t pref;
TIME_T brcTo;
Expand All @@ -830,12 +831,11 @@ struct orig_status {
char s[2]; // me supported by him
char T[2]; // trusted by me;
char t[2]; // me trusted by him
char *descKey;
char *nodeKey;
DESC_SQN_T descSqn;
char descSize[20];
char contents[12]; //contentRefs
char *pktKey;
char* name;
char *linkKey;
IPX_T primaryIp;
char *dev;
uint32_t nbIdx;
Expand All @@ -854,6 +854,7 @@ struct orig_status {
static const struct field_format orig_status_format[] = {
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_SHORT_ID, orig_status, shortId, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_GLOBAL_ID, orig_status, globalId, 1, FIELD_RELEVANCE_LOW),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_CHAR, orig_status, name, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_CHAR, orig_status, state, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_UINT, orig_status, pref, 1, FIELD_RELEVANCE_MEDI),
FIELD_FORMAT_INIT(FIELD_TYPE_UINT, orig_status, brcTo, 1, FIELD_RELEVANCE_MEDI),
Expand All @@ -866,12 +867,11 @@ static const struct field_format orig_status_format[] = {
FIELD_FORMAT_INIT(FIELD_TYPE_STRING_CHAR, orig_status, s, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_STRING_CHAR, orig_status, T, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_STRING_CHAR, orig_status, t, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_CHAR, orig_status, descKey, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_CHAR, orig_status, nodeKey, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_UINT, orig_status, descSqn, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_STRING_CHAR, orig_status, descSize, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_STRING_CHAR, orig_status, contents, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_CHAR, orig_status, pktKey, 1, FIELD_RELEVANCE_MEDI),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_CHAR, orig_status, name, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_CHAR, orig_status, linkKey, 1, FIELD_RELEVANCE_MEDI),
FIELD_FORMAT_INIT(FIELD_TYPE_IPX, orig_status, primaryIp, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_CHAR, orig_status, dev, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_UINT, orig_status, nbIdx, 1, FIELD_RELEVANCE_HIGH),
Expand Down Expand Up @@ -919,7 +919,7 @@ uint8_t *key_status_page(uint8_t *sOut, uint32_t i, struct orig_node *on, struct
os->recom = kn->recommendations_tree.items;
os->S[0] = (S = supportedKnownKey(&kn->kHash)) == -1 ? 'A' : (S + '0');
os->T[0] = (T = setted_pubkey(myKey->currOrig->descContent, BMX_DSC_TLV_TRUSTS, &kn->kHash)) == -1 ? 'A' : (T + '0');
os->descKey = (kn->content && (kn->content->f_body_len >= sizeof(struct dsc_msg_pubkey))) ?
os->nodeKey = (kn->content && (kn->content->f_body_len >= sizeof(struct dsc_msg_pubkey))) ?
cryptKeyTypeAsString(((struct dsc_msg_pubkey*) kn->content->f_body)->type) : DBG_NIL;
} else {
os->S[0] = '-';
Expand All @@ -939,7 +939,7 @@ uint8_t *key_status_page(uint8_t *sOut, uint32_t i, struct orig_node *on, struct
}

if (on) {
os->pktKey = (pkm = contents_data(dc, BMX_DSC_TLV_PKT_PUBKEY)) ? cryptKeyTypeAsString(pkm->type) : DBG_NIL;
os->linkKey = (pkm = contents_data(dc, BMX_DSC_TLV_LINK_PUBKEY)) ? cryptKeyTypeAsString(pkm->type) : DBG_NIL;
os->name = on->k.hostname;
os->primaryIp = on->primary_ip;
os->dev = on->curr_rt_link && on->curr_rt_link->k.myDev ? on->curr_rt_link->k.myDev->name_phy_cfg.str : DBG_NIL;
Expand Down
2 changes: 1 addition & 1 deletion content.c
View file
Expand Up @@ -1046,7 +1046,7 @@ void init_content( void )


static const struct field_format msg_content_hash_format[] = DSC_MSG_CHASH_FORMAT;
handl.name = "CONTENT_HASH";
handl.name = "DSC_CONTENT_HASH";
handl.data_header_size = sizeof( struct dsc_hdr_chash);
handl.min_msg_size = sizeof (struct dsc_msg_chash);
handl.fixed_msg_size = 0;
Expand Down
12 changes: 6 additions & 6 deletions link.c
View file
Expand Up @@ -701,8 +701,8 @@ struct link_status {
GLOBAL_ID_T *shortId;
GLOBAL_ID_T *globalId;
char* name;
char* descKey;
char* pktKey;
char* nodeKey;
char* linkKey;
IPX_T nbLocalIp;
char nbMac[40];
uint16_t nbIdx;
Expand All @@ -725,8 +725,8 @@ static const struct field_format link_status_format[] = {
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_SHORT_ID, link_status, shortId, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_GLOBAL_ID, link_status, globalId, 1, FIELD_RELEVANCE_LOW),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_CHAR, link_status, name, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_CHAR, link_status, descKey, 1, FIELD_RELEVANCE_MEDI),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_CHAR, link_status, pktKey, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_CHAR, link_status, nodeKey, 1, FIELD_RELEVANCE_MEDI),
FIELD_FORMAT_INIT(FIELD_TYPE_POINTER_CHAR, link_status, linkKey, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_IPX, link_status, nbLocalIp, 1, FIELD_RELEVANCE_HIGH),
FIELD_FORMAT_INIT(FIELD_TYPE_STRING_CHAR, link_status, nbMac, 1, FIELD_RELEVANCE_LOW),
FIELD_FORMAT_INIT(FIELD_TYPE_UINT, link_status, nbIdx, 1, FIELD_RELEVANCE_HIGH),
Expand Down Expand Up @@ -789,8 +789,8 @@ static int32_t link_status_creator(struct status_handl *handl, void *data)
status[i].globalId = &on->k.nodeId;
status[i].shortId = &on->k.nodeId;
status[i].name = on->k.hostname;
status[i].descKey = cryptKeyTypeAsString(((struct dsc_msg_pubkey*) on->key->content->f_body)->type);
status[i].pktKey = (pkm = contents_data(on->descContent, BMX_DSC_TLV_PKT_PUBKEY)) ? cryptKeyTypeAsString(pkm->type) : DBG_NIL;
status[i].nodeKey = cryptKeyTypeAsString(((struct dsc_msg_pubkey*) on->key->content->f_body)->type);
status[i].linkKey = (pkm = contents_data(on->descContent, BMX_DSC_TLV_LINK_PUBKEY)) ? cryptKeyTypeAsString(pkm->type) : DBG_NIL;
status[i].nbLocalIp = linkDev->key.llocal_ip;
strcpy(status[i].nbMac, memAsHexStringSep(ip6Eui64ToMac(&linkDev->key.llocal_ip, NULL), 6, 1, ":"));
status[i].nbIdx = linkDev->key.devIdx;
Expand Down
6 changes: 3 additions & 3 deletions msg.c
View file
Expand Up @@ -924,8 +924,8 @@ void tx_packets( void *unused ) {
assertion(-502442, (it.frame_type < FRAME_TYPE_SIGNATURE_ADV || it.frame_type > FRAME_TYPE_OGM_AGG_SQN_ADV));
assertion(-502443, (!it.frame_cache_msgs_size));
assertion(-500430, (it.frames_out_pos)); // single message larger than MAX_UDPD_SIZE
assertion_dbg(-502444, IMPLIES(it.frame_type > FRAME_TYPE_OGM_AGG_SQN_ADV, it.frames_out_pos > (int) (FRM_SIGN_VERS_SIZE_MIN + my_PktKey->rawKeyLen)),
"%d %d %d %d", it.frame_type, it.frames_out_pos, (FRM_SIGN_VERS_SIZE_MIN + my_PktKey->rawKeyLen));
assertion_dbg(-502444, IMPLIES(it.frame_type > FRAME_TYPE_OGM_AGG_SQN_ADV, it.frames_out_pos > (int) (FRM_SIGN_VERS_SIZE_MIN + my_LinkKey->rawKeyLen)),
"%d %d %d %d", it.frame_type, it.frames_out_pos, (FRM_SIGN_VERS_SIZE_MIN + my_LinkKey->rawKeyLen));
}

if ((result == TLV_TX_DATA_FULL || !nextTask || memcmp(&it.ttn->key.f.p, &nextTask->key.f.p, sizeof(nextTask->key.f.p))) && it.frames_out_pos) {
Expand All @@ -936,7 +936,7 @@ void tx_packets( void *unused ) {
pb.p.hdr.comp_version = my_compatibility;
pb.p.hdr.keyHash = myKey->kHash;

if (it.prev_out_type > FRAME_TYPE_OGM_AGG_SQN_ADV && my_PktKey && my_PktKey->rawKeyLen)
if (it.prev_out_type > FRAME_TYPE_OGM_AGG_SQN_ADV && my_LinkKey && my_LinkKey->rawKeyLen)
it.db->handls[FRAME_TYPE_SIGNATURE_ADV].tx_frame_handler(&it);

assertion(-502446, (it.frames_out_pos <= it.frames_out_max));
Expand Down
6 changes: 3 additions & 3 deletions msg.h
View file
Expand Up @@ -77,7 +77,7 @@ extern int32_t txBucketSize;
#define FRM_SIGN_VERS_SIZE_MIN (sizeof(struct tlv_hdr) + sizeof(struct frame_msg_signature) + \
sizeof(struct tlv_hdr) + sizeof(struct msg_ogm_aggreg_sqn_adv))

#define FRM_SIGN_VERS_SIZE_MAX (FRM_SIGN_VERS_SIZE_MIN + (MAX_PACKET_SIGN/8))
#define FRM_SIGN_VERS_SIZE_MAX (FRM_SIGN_VERS_SIZE_MIN + (MAX_LINK_SIGN_LEN/8))

#define SIGNED_FRAMES_SIZE_PREF (PKT_FRAMES_SIZE_PREF - FRM_SIGN_VERS_SIZE_MAX)
#define SIGNED_FRAMES_SIZE_MAX (PKT_FRAMES_SIZE_MAX - FRM_SIGN_VERS_SIZE_MAX)
Expand Down Expand Up @@ -237,10 +237,10 @@ struct tlv_hdr tlvSetBigEndian(int16_t type, int16_t length);


#define BMX_DSC_TLV_CONTENT_HASH 0x00
#define BMX_DSC_TLV_DSC_PUBKEY 0x01
#define BMX_DSC_TLV_NODE_PUBKEY 0x01
#define BMX_DSC_TLV_DSC_SIGNATURE 0x02
#define BMX_DSC_TLV_VERSION 0x03
#define BMX_DSC_TLV_PKT_PUBKEY 0x05
#define BMX_DSC_TLV_LINK_PUBKEY 0x05

#define BMX_DSC_TLV_NAMES 0x07

Expand Down
18 changes: 9 additions & 9 deletions node.c
View file
Expand Up @@ -265,8 +265,8 @@ void neigh_destroy(struct neigh_node *local)
local->on->neigh = NULL;
local->on = NULL;

if (local->pktKey)
cryptKeyFree(&local->pktKey);
if (local->linkKey)
cryptKeyFree(&local->linkKey);

free_internalNeighId(local->internalNeighId);

Expand All @@ -286,10 +286,10 @@ struct neigh_node *neigh_create(struct orig_node *on)

nn->internalNeighId = allocate_internalNeighId(nn);

struct dsc_msg_pubkey *pkey_msg = contents_data(on->descContent, BMX_DSC_TLV_PKT_PUBKEY);
struct dsc_msg_pubkey *pkey_msg = contents_data(on->descContent, BMX_DSC_TLV_LINK_PUBKEY);

if (pkey_msg)
nn->pktKey = cryptPubKeyFromRaw(pkey_msg->key, cryptKeyLenByType(pkey_msg->type));
nn->linkKey = cryptPubKeyFromRaw(pkey_msg->key, cryptKeyLenByType(pkey_msg->type));

nn->on = on;
return nn;
Expand Down Expand Up @@ -401,15 +401,15 @@ void destroy_orig_node(struct orig_node *on)

void init_self(void)
{
assertion(-502094, (my_PubKey));
assertion(-502094, (my_NodeKey));
assertion(-502477, (!myKey));

struct key_credits friend_kc = {.friend=1};
struct dsc_msg_pubkey *msg = debugMallocReset(sizeof(struct dsc_msg_pubkey) +my_PubKey->rawKeyLen, -300631);
msg->type = my_PubKey->rawKeyType;
memcpy(msg->key, my_PubKey->rawKey, my_PubKey->rawKeyLen);
struct dsc_msg_pubkey *msg = debugMallocReset(sizeof(struct dsc_msg_pubkey) +my_NodeKey->rawKeyLen, -300631);
msg->type = my_NodeKey->rawKeyType;
memcpy(msg->key, my_NodeKey->rawKey, my_NodeKey->rawKeyLen);

struct content_node *cn = content_add_body((uint8_t*)msg, sizeof(struct dsc_msg_pubkey) +my_PubKey->rawKeyLen, 0, 0, YES);
struct content_node *cn = content_add_body((uint8_t*)msg, sizeof(struct dsc_msg_pubkey) +my_NodeKey->rawKeyLen, 0, 0, YES);

myKey = keyNode_updCredits(&cn->chash, NULL, &friend_kc);

Expand Down
2 changes: 1 addition & 1 deletion node.h
View file
Expand Up @@ -258,7 +258,7 @@ struct neigh_node {
int32_t orig_routes;

struct orig_node *on;
CRYPTKEY_T *pktKey;
CRYPTKEY_T *linkKey;


struct avl_tree refsByDhash_tree;
Expand Down
6 changes: 3 additions & 3 deletions ogm.c
View file
Expand Up @@ -567,7 +567,7 @@ int32_t init_ogm( void )
struct frame_handl handl;
memset(&handl, 0, sizeof ( handl));

handl.name = "AGGREG_SQN_ADV";
handl.name = "OGMS_SQNS_ADV";
handl.min_msg_size = sizeof(struct msg_ogm_aggreg_sqn_adv);
handl.fixed_msg_size = 1;

Expand All @@ -578,7 +578,7 @@ int32_t init_ogm( void )
handl.rx_frame_handler = rx_frame_ogm_aggreg_sqn;
register_frame_handler(packet_frame_db, FRAME_TYPE_OGM_AGG_SQN_ADV, &handl);

handl.name = "OGM_AGGREG_REQ";
handl.name = "OGMS_REQ";
handl.data_header_size = sizeof(struct hdr_ogm_aggreg_req);
handl.min_msg_size = sizeof(struct msg_ogm_aggreg_req);
handl.fixed_msg_size = 1;
Expand All @@ -587,7 +587,7 @@ int32_t init_ogm( void )
handl.rx_msg_handler = rx_msg_ogm_aggreg_request;
register_frame_handler(packet_frame_db, FRAME_TYPE_OGM_REQ, &handl);

handl.name = "OGM_DHASH_ADV";
handl.name = "OGMS_DHASH_ADV";
handl.data_header_size = sizeof(struct hdr_ogm_adv);
handl.min_msg_size = sizeof(struct msg_ogm_dhash_adv);
handl.fixed_msg_size = 1;
Expand Down

0 comments on commit 2004658

Please sign in to comment.