Skip to content

Commit

Permalink
一旦ロードしたBonDriverを、使用クライアントがいなくなった時にFreeLibrary()するのを許可しない設定を追加
Browse files Browse the repository at this point in the history
  • Loading branch information
unknown committed Jan 30, 2015
1 parent 8c98740 commit 2b61c99
Show file tree
Hide file tree
Showing 3 changed files with 111 additions and 28 deletions.
131 changes: 103 additions & 28 deletions BonDriverProxy/BonDriverProxy.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,31 @@ static int Init(HMODULE hModule)
GetPrivateProfileStringA("OPTION", "ADDRESS", "127.0.0.1", g_Host, sizeof(g_Host), szIniPath);
GetPrivateProfileStringA("OPTION", "PORT", "1192", g_Port, sizeof(g_Port), szIniPath);
g_SandBoxedRelease = GetPrivateProfileIntA("OPTION", "SANDBOXED_RELEASE", 0, szIniPath);
g_DisableUnloadBonDriver = GetPrivateProfileIntA("OPTION", "DISABLE_UNLOAD_BONDRIVER", 0, szIniPath);

g_PacketFifoSize = GetPrivateProfileIntA("SYSTEM", "PACKET_FIFO_SIZE", 64, szIniPath);
g_TsPacketBufSize = GetPrivateProfileIntA("SYSTEM", "TSPACKET_BUFSIZE", (188 * 1024), szIniPath);

return 0;
}

static void CleanUp()
{
if (g_DisableUnloadBonDriver)
{
while (!g_LoadedDriverList.empty())
{
stLoadedDriver *pLd = g_LoadedDriverList.front();
g_LoadedDriverList.pop_front();
FreeLibrary(pLd->hModule);
#if _DEBUG
_RPT1(_CRT_WARN, "[%s] unloaded\n", pLd->strBonDriver);
#endif
delete pLd;
}
}
}

cProxyServer::cProxyServer() : m_Error(TRUE, FALSE)
{
m_s = INVALID_SOCKET;
Expand Down Expand Up @@ -78,7 +96,15 @@ cProxyServer::~cProxyServer()
Release();

if (m_hModule)
::FreeLibrary(m_hModule);
{
if (!g_DisableUnloadBonDriver)
{
::FreeLibrary(m_hModule);
#if _DEBUG
_RPT1(_CRT_WARN, "[%s] unloaded\n", m_strBonDriver);
#endif
}
}
}
else
{
Expand Down Expand Up @@ -162,39 +188,45 @@ DWORD cProxyServer::Process()
makePacket(eSelectBonDriver, FALSE);
else
{
BOOL bFind = FALSE;
LPCSTR p = (LPCSTR)(pPh->m_pPacket->payload);
if (::strlen(p) > (sizeof(m_strBonDriver) - 1))
makePacket(eSelectBonDriver, FALSE);
else
{
BOOL bFind = FALSE;
#ifndef STRICT_LOCK
LOCK(g_Lock);
LOCK(g_Lock);
#endif
for (std::list<cProxyServer *>::iterator it = g_InstanceList.begin(); it != g_InstanceList.end(); ++it)
{
if (::strcmp((LPCSTR)(pPh->m_pPacket->payload), (*it)->m_strBonDriver) == 0)
for (std::list<cProxyServer *>::iterator it = g_InstanceList.begin(); it != g_InstanceList.end(); ++it)
{
bFind = TRUE;
m_hModule = (*it)->m_hModule;
::strcpy(m_strBonDriver, (*it)->m_strBonDriver);
m_pIBon = (*it)->m_pIBon; // (*it)->m_pIBonがNULLの可能性はゼロではない
m_pIBon2 = (*it)->m_pIBon2;
m_pIBon3 = (*it)->m_pIBon3;
break;
if (::strcmp(p, (*it)->m_strBonDriver) == 0)
{
bFind = TRUE;
m_hModule = (*it)->m_hModule;
::strcpy(m_strBonDriver, (*it)->m_strBonDriver);
m_pIBon = (*it)->m_pIBon; // (*it)->m_pIBonがNULLの可能性はゼロではない
m_pIBon2 = (*it)->m_pIBon2;
m_pIBon3 = (*it)->m_pIBon3;
break;
}
}
}
BOOL bSuccess;
if (!bFind)
{
bSuccess = SelectBonDriver((LPCSTR)(pPh->m_pPacket->payload));
if (bSuccess)
BOOL bSuccess;
if (!bFind)
{
bSuccess = SelectBonDriver(p);
if (bSuccess)
{
g_InstanceList.push_back(this);
::strcpy(m_strBonDriver, p);
}
}
else
{
g_InstanceList.push_back(this);
::strcpy_s(m_strBonDriver, (LPCSTR)(pPh->m_pPacket->payload));
bSuccess = TRUE;
}
makePacket(eSelectBonDriver, bSuccess);
}
else
{
g_InstanceList.push_back(this);
bSuccess = TRUE;
}
makePacket(eSelectBonDriver, bSuccess);
}
break;
}
Expand Down Expand Up @@ -868,8 +900,39 @@ BOOL cProxyServer::SelectBonDriver(LPCSTR p)
{
if (p[0] == '\\' && p[1] == '\\')
return FALSE;
m_hModule = ::LoadLibraryA(p);
return (m_hModule != NULL);

HMODULE hModule = NULL;
BOOL bLoaded = FALSE;
for (std::list<stLoadedDriver *>::iterator it = g_LoadedDriverList.begin(); it != g_LoadedDriverList.end(); ++it)
{
if (::strcmp(p, (*it)->strBonDriver) == 0)
{
hModule = (*it)->hModule;
bLoaded = TRUE;
break;
}
}
if (hModule == NULL)
{
hModule = ::LoadLibraryA(p);
if (hModule == NULL)
return FALSE;
#if _DEBUG
_RPT1(_CRT_WARN, "[%s] loaded\n", p);
#endif
}

m_hModule = hModule;

if (g_DisableUnloadBonDriver && !bLoaded)
{
stLoadedDriver *pLd = new stLoadedDriver;
::strcpy(pLd->strBonDriver, p); // stLoadedDriver::strBonDriverのサイズはProxyServer::m_strBonDriverと同じ
pLd->hModule = hModule;
g_LoadedDriverList.push_back(pLd);
}

return TRUE;
}

IBonDriver *cProxyServer::CreateBonDriver()
Expand Down Expand Up @@ -1139,6 +1202,11 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
DispatchMessage(&msg);
}

{
LOCK(g_Lock);
CleanUp();
}

WSACleanup();

_CrtMemCheckpoint(&nstate);
Expand All @@ -1163,6 +1231,13 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE/*hPrevInstance*/, LPSTR/*lpCmd
return -2;

int ret = Listen(g_Host, g_Port);

{
// 来ないけど一応
LOCK(g_Lock);
CleanUp();
}

WSACleanup();
return ret;
}
Expand Down
6 changes: 6 additions & 0 deletions BonDriverProxy/BonDriverProxy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ static char g_Port[8];
static size_t g_PacketFifoSize;
static DWORD g_TsPacketBufSize;
static BOOL g_SandBoxedRelease;
static BOOL g_DisableUnloadBonDriver;
struct stLoadedDriver {
char strBonDriver[MAX_PATH];
HMODULE hModule;
};
static std::list<stLoadedDriver *> g_LoadedDriverList;

#include "BdpPacket.h"

Expand Down
2 changes: 2 additions & 0 deletions ini_info.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ TSPACKET_BUFSIZE ->
ADDRESS -> �I�v�V�����A�f�t�H���g127.0.0.1 : �҂��󂯂ɗ��p����A�h���X
PORT -> �I�v�V�����A�f�t�H���g1192 : �҂��󂯃|�[�g
SANDBOXED_RELEASE -> �I�v�V�����A�f�t�H���g0 : BonDriver�ɑ΂���Release()�����݂�ۂɁA���̓����Ŕ�������Access Violation���𖳎����邩�ǂ��� / 1:yes 0:no
DISABLE_UNLOAD_BONDRIVER -> �I�v�V�����A�f�t�H���g0 : ���[�h����BonDriver���A�g�p�N���C�A���g�����Ȃ��Ȃ�������FreeLibrary()����̂����‚��Ȃ����ǂ��� / 1:yes 0:no

[SYSTEM]
PACKET_FIFO_SIZE -> �I�v�V�����A�f�t�H���g64 : �N���C�A���g���̕��Ɠ���
Expand All @@ -43,6 +44,7 @@ ADDRESS ->
PORT -> �I�v�V�����A�f�t�H���g1192 : �T�[�o��(BonDriverProxy)�̕��Ɠ���
OPENTUNER_RETURN_DELAY -> �I�v�V�����A�f�t�H���g0 : BonDriver�ɑ΂���OpenTuner()�����݂���A�Ȍ�̏������J�n����܂łɑ҂Ž���(�~���b)
SANDBOXED_RELEASE -> �I�v�V�����A�f�t�H���g0 : �T�[�o��(BonDriverProxy)�̕��Ɠ���
DISABLE_UNLOAD_BONDRIVER -> �I�v�V�����A�f�t�H���g0 : �T�[�o��(BonDriverProxy)�̕��Ɠ���

[BONDRIVER]
00 -> ���ʂɍl����ƕK�{�ł����A�����Ă��N�����̂͏o���Ă��܂��܂� : BonDriver�O���[�v��`
Expand Down

0 comments on commit 2b61c99

Please sign in to comment.