ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 10:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Whos been commiting a quarter of a fix?

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/branches/1_1_stable@9926 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
brain 2008-06-19 23:55:49 +00:00
parent 80703b4ce5
commit 0aef046e36
3 changed files with 20 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/extra/m_ssl_gnutls.cpp
View File

@ -494,7 +494,7 @@ class ModuleSSLGnuTLS : public Module
if(count <= length)
{
memcpy(buffer, session->inbuf, count);
memmove(buffer, session->inbuf, count);
// Move the stuff left in inbuf to the beginning of it
memmove(session->inbuf, session->inbuf + count, (length - count));
// Now we need to set session->inbufoffset to the amount of data still waiting to be handed to insp.
@ -505,7 +505,7 @@ class ModuleSSLGnuTLS : public Module
else
{
// There's not as much in the inbuf as there is space in the buffer, so just copy the whole thing.
memcpy(buffer, session->inbuf, length);
memmove(buffer, session->inbuf, length);
// Zero the offset, as there's nothing there..
session->inbufoffset = 0;
// As above

6
src/modules/extra/m_ssl_openssl.cpp
View File

@ -523,9 +523,9 @@ class ModuleSSLOpenSSL : public Module
{
if (count <= session->inbufoffset)
{
memcpy(buffer, session->inbuf, count);
memmove(buffer, session->inbuf, count);
// Move the stuff left in inbuf to the beginning of it
memcpy(session->inbuf, session->inbuf + count, (session->inbufoffset - count));
memmove(session->inbuf, session->inbuf + count, (session->inbufoffset - count));
// Now we need to set session->inbufoffset to the amount of data still waiting to be handed to insp.
session->inbufoffset -= count;
// Insp uses readresult as the count of how much data there is in buffer, so:
@ -534,7 +534,7 @@ class ModuleSSLOpenSSL : public Module
else
{
// There's not as much in the inbuf as there is space in the buffer, so just copy the whole thing.
memcpy(buffer, session->inbuf, session->inbufoffset);
memmove(buffer, session->inbuf, session->inbufoffset);
readresult = session->inbufoffset;
// Zero the offset, as there's nothing there..

53
win/inspircdVC80.vcproj
View File

@ -1174,18 +1174,6 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\modules\extra\m_filter_pcre.cpp"
>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\modules\m_filter_pcre.cpp"
>
@ -1209,6 +1197,18 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\modules\extra\m_filter_pcre.cpp"
>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\modules\m_foobar.cpp"
>
@ -2110,30 +2110,19 @@
</FileConfiguration>
</File>
<File
RelativePath="..\src\modules\m_ssl_gnutls.cpp"
RelativePath="..\src\modules\extra\m_ssl_openssl.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\modules\extra\m_ssl_openssl.cpp"
RelativePath="..\src\modules\extra\m_ssl_oper_cert.cpp"
>
<FileConfiguration
Name="Release|Win32"
@ -2168,7 +2157,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\src\modules\extra\m_ssl_oper_cert.cpp"
RelativePath="..\src\modules\extra\m_sslinfo.cpp"
>
<FileConfiguration
Name="Release|Win32"
@ -2202,18 +2191,6 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\modules\extra\m_sslinfo.cpp"
>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\modules\m_sslmodes.cpp"
>