Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Knot DNS
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
22
Issues
22
List
Boards
Labels
Service Desk
Milestones
Merge Requests
17
Merge Requests
17
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Knot projects
Knot DNS
Commits
6178ad8d
Commit
6178ad8d
authored
Jun 13, 2012
by
Lubos Slovak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reusing RRSet in processing of the add section.
- Not finished yet! refs #1343 @15m
parent
7f954846
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
44 additions
and
17 deletions
+44
-17
src/libknot/updates/xfr-in.c
src/libknot/updates/xfr-in.c
+44
-17
No files found.
src/libknot/updates/xfr-in.c
View file @
6178ad8d
...
...
@@ -1964,28 +1964,54 @@ static int xfrin_apply_add_normal(knot_changes_t *changes,
int
ret
;
dbg_xfrin_verb
(
"applying rrset:
\n
"
);
dbg_xfrin_exec_detail
(
dbg_xfrin_detail
(
"applying rrset:
\n
"
);
knot_rrset_dump
(
add
,
0
);
);
int
copied
=
0
;
/*! \note Reusing RRSet from previous function caused it not to be
* removed from the node.
* Maybe modification of the code would allow reusing the RRSet
* as in apply_add_rrsigs() - the RRSet should not be copied
* in such case.
*/
if
(
*
rrset
&&
knot_dname_compare
(
knot_rrset_owner
(
*
rrset
),
knot_node_owner
(
node
))
==
0
&&
knot_rrset_type
(
*
rrset
)
==
knot_rrset_type
(
add
))
{
dbg_xfrin_verb
(
"Using RRSet from previous iteration.
\n
"
);
}
else
{
dbg_xfrin_detail
(
"Removing rrset!
\n
"
);
*
rrset
=
knot_node_remove_rrset
(
node
,
knot_rrset_type
(
add
));
knot_rrset_t
*
old
=
*
rrset
;
ret
=
xfrin_copy_old_rrset
(
old
,
rrset
,
changes
);
if
(
ret
!=
KNOT_EOK
)
{
return
ret
;
}
dbg_xfrin_detail
(
"Copied RRSet: %p
\n
"
,
*
rrset
);
copied
=
1
;
}
// if (!*rrset
// || knot_dname_compare(knot_rrset_owner(*rrset),
// knot_node_owner(node)) != 0
// || knot_rrset_type(*rrset)
// != knot_rrset_type(add)) {
// dbg_xfrin("Removing rrset!\n");
// || knot_rrset_type(*rrset) != knot_rrset_type(add)) {
// dbg_xfrin_detail("Removing rrset!\n");
// *rrset = knot_node_remove_rrset(node, knot_rrset_type(add));
// } else {
// dbg_xfrin_verb("Using RRSet from previous iteration.\n");
// }
*
rrset
=
knot_node_remove_rrset
(
node
,
knot_rrset_type
(
add
));
//
*rrset = knot_node_remove_rrset(node, knot_rrset_type(add));
dbg_xfrin_exec_detail
(
dbg_xfrin_detail
(
"Removed RRSet:
\n
"
);
knot_rrset_dump
(
*
rrset
,
1
);
);
if
(
*
rrset
==
NULL
)
{
dbg_xfrin_exec_detail
(
...
...
@@ -2018,8 +2044,6 @@ dbg_xfrin_exec_detail(
return
1
;
// return 1 to indicate the add RRSet was used
}
knot_rrset_t
*
old
=
*
rrset
;
dbg_xfrin_exec_detail
(
char
*
name
=
knot_dname_to_str
(
knot_rrset_owner
(
*
rrset
));
dbg_xfrin_detail
(
"Found RRSet with owner %s, type %s
\n
"
,
name
,
...
...
@@ -2027,12 +2051,12 @@ dbg_xfrin_exec_detail(
free
(
name
);
);
// knot_rrset_dump(*rrset, 1);
ret
=
xfrin_copy_old_rrset
(
old
,
rrset
,
changes
);
if
(
ret
!=
KNOT_EOK
)
{
return
ret
;
}
//
ret = xfrin_copy_old_rrset(old, rrset, changes);
//
if (ret != KNOT_EOK) {
//
return ret;
//
}
dbg_xfrin_detail
(
"Copied RRSet: %p
\n
"
,
*
rrset
);
//
dbg_xfrin_detail("Copied RRSet: %p\n", *rrset);
// dbg_xfrin("After copy: Found RRSet with owner %s, type %s\n",
// knot_dname_to_str((*rrset)->owner),
...
...
@@ -2058,16 +2082,19 @@ dbg_xfrin_exec_detail(
ret
=
knot_rrset_merge
((
void
**
)
rrset
,
(
void
**
)
&
add
);
if
(
ret
!=
KNOT_EOK
)
{
dbg_xfrin
(
"Failed to merge changeset RRSet
to copy
.
\n
"
);
dbg_xfrin
(
"Failed to merge changeset RRSet.
\n
"
);
return
KNOT_ERROR
;
}
dbg_xfrin_detail
(
"Merge returned: %d
\n
"
,
ret
);
knot_rrset_dump
(
*
rrset
,
1
);
ret
=
knot_node_add_rrset
(
node
,
*
rrset
,
0
);
if
(
ret
<
0
)
{
dbg_xfrin
(
"Failed to add merged RRSet to the node.
\n
"
);
return
ret
;
if
(
copied
)
{
ret
=
knot_node_add_rrset
(
node
,
*
rrset
,
0
);
if
(
ret
<
0
)
{
dbg_xfrin
(
"Failed to add merged RRSet to the node.
\n
"
);
return
ret
;
}
}
// return 2 so that the add RRSet is removed from
...
...
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