Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISC Open Source Projects
Kea
Commits
d694e5de
Commit
d694e5de
authored
May 25, 2011
by
Michal 'vorner' Vaner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "[trac931] Use uint32_t for fixed-sized lengths"
This reverts commit
6342eda0
.
parent
5d33e8c4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
src/lib/cc/session.cc
src/lib/cc/session.cc
+10
-10
No files found.
src/lib/cc/session.cc
View file @
d694e5de
...
...
@@ -79,11 +79,11 @@ public:
{}
void
establish
(
const
char
&
socket_file
);
void
disconnect
();
void
writeData
(
const
void
*
data
,
uint32
_t
datalen
);
uint32
_t
readDataLength
();
void
writeData
(
const
void
*
data
,
size
_t
datalen
);
size
_t
readDataLength
();
// Blocking read. Will throw a SessionTimeout if the timeout value
// (in seconds) is thrown. If timeout is 0 it will block forever
void
readData
(
void
*
data
,
uint32
_t
datalen
);
void
readData
(
void
*
data
,
size
_t
datalen
);
void
startRead
(
boost
::
function
<
void
()
>
user_handler
);
void
setTimeout
(
size_t
seconds
)
{
timeout_
=
seconds
;
};
size_t
getTimeout
()
const
{
return
timeout_
;
};
...
...
@@ -94,7 +94,7 @@ public:
private:
void
internalRead
(
const
asio
::
error_code
&
error
,
uint32
_t
bytes_transferred
);
size
_t
bytes_transferred
);
private:
io_service
&
io_service_
;
...
...
@@ -136,7 +136,7 @@ SessionImpl::disconnect() {
}
void
SessionImpl
::
writeData
(
const
void
*
data
,
uint32
_t
datalen
)
{
SessionImpl
::
writeData
(
const
void
*
data
,
size
_t
datalen
)
{
try
{
asio
::
write
(
socket_
,
asio
::
buffer
(
data
,
datalen
));
}
catch
(
const
asio
::
system_error
&
asio_ex
)
{
...
...
@@ -144,9 +144,9 @@ SessionImpl::writeData(const void* data, uint32_t datalen) {
}
}
uint32
_t
size
_t
SessionImpl
::
readDataLength
()
{
uint32
_t
ret_len
=
data_length_
;
size
_t
ret_len
=
data_length_
;
if
(
ret_len
==
0
)
{
readData
(
&
data_length_
,
sizeof
(
data_length_
));
...
...
@@ -161,7 +161,7 @@ SessionImpl::readDataLength() {
}
void
SessionImpl
::
readData
(
void
*
data
,
uint32
_t
datalen
)
{
SessionImpl
::
readData
(
void
*
data
,
size
_t
datalen
)
{
boost
::
optional
<
asio
::
error_code
>
read_result
;
boost
::
optional
<
asio
::
error_code
>
timer_result
;
...
...
@@ -227,7 +227,7 @@ SessionImpl::startRead(boost::function<void()> user_handler) {
void
SessionImpl
::
internalRead
(
const
asio
::
error_code
&
error
,
uint32
_t
bytes_transferred
)
size
_t
bytes_transferred
)
{
if
(
!
error
)
{
assert
(
bytes_transferred
==
sizeof
(
data_length_
));
...
...
@@ -349,7 +349,7 @@ bool
Session
::
recvmsg
(
ConstElementPtr
&
env
,
ConstElementPtr
&
msg
,
bool
nonblock
,
int
seq
)
{
uint32
_t
length
=
impl_
->
readDataLength
();
size
_t
length
=
impl_
->
readDataLength
();
if
(
hasQueuedMsgs
())
{
ConstElementPtr
q_el
;
for
(
int
i
=
0
;
i
<
impl_
->
queue_
->
size
();
i
++
)
{
...
...
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