Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
dhcp
Commits
1a6b62fe
Commit
1a6b62fe
authored
Dec 07, 2017
by
Thomas Markwalder
Browse files
[master] Plugs a socket descriptor leak in OMAPI
Merges in rt46767.
parent
2bc53156
Changes
3
Hide whitespace changes
Inline
Side-by-side
RELNOTES
View file @
1a6b62fe
...
...
@@ -1254,6 +1254,11 @@ dhcp-users@lists.isc.org.
to
accomodate
a
change
in
behavior
in
BIND9
isc_heap_delete
().
[
ISC
-
bugs
#
46719
]
-
Plugged
a
socket
descriptor
leak
in
OMAPI
,
that
can
occur
when
there
is
data
pending
to
be
written
to
an
OMAPI
connection
,
when
the
connection
is
closed
by
the
reader
.
[
ISc
-
Bugs
#
46767
]
Changes
since
4.2.0
(
new
features
)
-
If
a
client
renews
before
'dhcp-cache-threshold'
percent
of
its
lease
...
...
omapip/buffer.c
View file @
1a6b62fe
...
...
@@ -565,6 +565,15 @@ isc_result_t omapi_connection_writer (omapi_object_t *h)
omapi_buffer_dereference
(
&
buffer
,
MDL
);
}
}
/* If we had data left to write when we're told to disconnect,
* we need recall disconnect, now that we're done writing.
* See rt46767. */
if
(
c
->
out_bytes
==
0
&&
c
->
state
==
omapi_connection_disconnecting
)
{
omapi_disconnect
(
h
,
1
);
return
ISC_R_SHUTTINGDOWN
;
}
return
ISC_R_SUCCESS
;
}
...
...
omapip/message.c
View file @
1a6b62fe
...
...
@@ -339,7 +339,7 @@ isc_result_t omapi_message_unregister (omapi_object_t *mo)
}
#ifdef DEBUG_PROTOCOL
static
const
char
*
omapi_message_op_name
(
int
op
)
{
const
char
*
omapi_message_op_name
(
int
op
)
{
switch
(
op
)
{
case
OMAPI_OP_OPEN
:
return
"OMAPI_OP_OPEN"
;
case
OMAPI_OP_REFRESH
:
return
"OMAPI_OP_REFRESH"
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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