Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Knot DNS
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
23
Issues
23
List
Boards
Labels
Milestones
Merge Requests
5
Merge Requests
5
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Knot projects
Knot DNS
Commits
0fa325e0
Commit
0fa325e0
authored
Jun 29, 2016
by
Karel Slaný
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
review: isolated duplicated code in FNV64 cookie algorithm
parent
d95da463
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
25 deletions
+23
-25
src/libknot/cookies/alg-fnv64.c
src/libknot/cookies/alg-fnv64.c
+23
-25
No files found.
src/libknot/cookies/alg-fnv64.c
View file @
0fa325e0
...
...
@@ -27,7 +27,26 @@
#include "libknot/errcode.h"
/*!
* Compute client cookie using FNV-64.
* \brief Update hash value.
*
* \param hash_val Hash value to be updated.
* \param sockaddr Socket address.
*/
static
inline
void
update_hash
(
Fnv64_t
*
hash_val
,
const
struct
sockaddr
*
sockaddr
)
{
assert
(
hash_val
&&
sockaddr
);
size_t
addr_len
=
0
;
const
uint8_t
*
addr
=
sockaddr_raw
((
struct
sockaddr_storage
*
)
sockaddr
,
&
addr_len
);
if
(
addr
)
{
assert
(
addr_len
);
*
hash_val
=
fnv_64a_buf
((
void
*
)
addr
,
addr_len
,
*
hash_val
);
}
}
/*!
* \brief Compute client cookie using FNV-64.
*
* \note At least one input address must be provided.
*
...
...
@@ -49,27 +68,14 @@ static int cc_gen_fnv64(const struct knot_cc_input *input,
return
KNOT_EINVAL
;
}
const
uint8_t
*
addr
=
NULL
;
size_t
addr_len
=
0
;
Fnv64_t
hash_val
=
FNV1A_64_INIT
;
if
(
input
->
clnt_sockaddr
)
{
addr
=
sockaddr_raw
((
struct
sockaddr_storage
*
)
input
->
clnt_sockaddr
,
&
addr_len
);
if
(
addr
)
{
assert
(
addr_len
);
hash_val
=
fnv_64a_buf
((
void
*
)
addr
,
addr_len
,
hash_val
);
}
update_hash
(
&
hash_val
,
input
->
clnt_sockaddr
);
}
if
(
input
->
srvr_sockaddr
)
{
addr
=
sockaddr_raw
((
struct
sockaddr_storage
*
)
input
->
srvr_sockaddr
,
&
addr_len
);
if
(
addr
)
{
assert
(
addr_len
);
hash_val
=
fnv_64a_buf
((
void
*
)
addr
,
addr_len
,
hash_val
);
}
update_hash
(
&
hash_val
,
input
->
srvr_sockaddr
);
}
hash_val
=
fnv_64a_buf
((
void
*
)
input
->
secret_data
,
input
->
secret_len
,
...
...
@@ -111,18 +117,10 @@ static int sc_gen_fnv64(const struct knot_sc_input *input,
return
KNOT_EINVAL
;
}
const
uint8_t
*
addr
=
NULL
;
size_t
addr_len
=
0
;
Fnv64_t
hash_val
=
FNV1A_64_INIT
;
if
(
input
->
srvr_data
->
clnt_sockaddr
)
{
addr
=
sockaddr_raw
((
struct
sockaddr_storage
*
)
input
->
srvr_data
->
clnt_sockaddr
,
&
addr_len
);
if
(
addr
)
{
assert
(
addr_len
);
hash_val
=
fnv_64a_buf
((
void
*
)
addr
,
addr_len
,
hash_val
);
}
update_hash
(
&
hash_val
,
input
->
srvr_data
->
clnt_sockaddr
);
}
if
(
input
->
nonce
&&
input
->
nonce_len
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment