FLVなど sext styp のついた配信のリレーができない問題を修正するパッチ
| Revisión | 21204ffbbf9b97b6d0e29080f7912fcf8996a6db (tree) |
|---|---|
| Tiempo | 2009-07-05 22:48:26 |
| Autor | eru <eru01@user...> |
| Commiter | eru |
chl==NULLで落ちるバグを修正
PeerCast.root/PeerCast/core/common/servent.cpp (diff)
PeerCast.root/PeerCast/core/common/version2.h (diff)
PeerCast.root/PeerCast/ui/win32/simple/Simple.rc (diff) c:/Git/PeerCast.root/PeerCast/core/common/servent.cpp (diff) c:/Git/PeerCast.root/PeerCast/core/common/version2.h (diff) c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc (diff)| @@ -977,7 +977,7 @@ bool Servent::handshakeStream(ChanInfo &chanInfo) | ||
| 977 | 977 | }*/ |
| 978 | 978 | |
| 979 | 979 | ChanHitList *chl = chanMgr->findHitList(chanInfo); |
| 980 | - ChanHit *hit = chl->hit; | |
| 980 | + ChanHit *hit = (chl ? chl->hit : NULL); | |
| 981 | 981 | while(hit){ |
| 982 | 982 | if (hit->host.isValid() && (h.ip == hit->host.ip)) |
| 983 | 983 | { |
| @@ -44,9 +44,9 @@ extern int version_ex; // VERSION_EX | ||
| 44 | 44 | #if 1 /* for VP extend version */ |
| 45 | 45 | //#define VERSION_EX 1 |
| 46 | 46 | static const char *PCP_CLIENT_VERSION_EX_PREFIX = "IM"; // 2bytes only |
| 47 | -static const int PCP_CLIENT_VERSION_EX_NUMBER = 37; | |
| 48 | -static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0037)"; | |
| 49 | -static const char *PCX_VERSTRING_EX = "v0.1218(IM0037)"; | |
| 47 | +static const int PCP_CLIENT_VERSION_EX_NUMBER = 38; | |
| 48 | +static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0038)"; | |
| 49 | +static const char *PCX_VERSTRING_EX = "v0.1218(IM0038)"; | |
| 50 | 50 | |
| 51 | 51 | static const char *PCP_CLIENT_DIST_URL = "http://peercastim.s353.xrea.com/"; |
| 52 | 52 | #endif |
| @@ -95,7 +95,7 @@ BEGIN | ||
| 95 | 95 | MENUITEM "PeerCast", ID_POPUP_SHOWMESSAGES_PEERCAST |
| 96 | 96 | MENUITEM "配信者", ID_POPUP_SHOWMESSAGES_BROADCASTERS |
| 97 | 97 | MENUITEM "トラック情報", ID_POPUP_SHOWMESSAGES_TRACKINFO |
| 98 | - MENUITEM "アップデート情報", ID_POPUP_POPUPMESSAGES_UPGRADEALERTS, CHECKED, GRAYED | |
| 98 | + MENUITEM "アップデート情報", ID_POPUP_SHOWGUI, CHECKED, GRAYED | |
| 99 | 99 | END |
| 100 | 100 | POPUP "高度" |
| 101 | 101 | BEGIN |
| @@ -977,7 +977,7 @@ bool Servent::handshakeStream(ChanInfo &chanInfo) | ||
| 977 | 977 | }*/ |
| 978 | 978 | |
| 979 | 979 | ChanHitList *chl = chanMgr->findHitList(chanInfo); |
| 980 | - ChanHit *hit = chl->hit; | |
| 980 | + ChanHit *hit = (chl ? chl->hit : NULL); | |
| 981 | 981 | while(hit){ |
| 982 | 982 | if (hit->host.isValid() && (h.ip == hit->host.ip)) |
| 983 | 983 | { |
| @@ -44,9 +44,9 @@ extern int version_ex; // VERSION_EX | ||
| 44 | 44 | #if 1 /* for VP extend version */ |
| 45 | 45 | //#define VERSION_EX 1 |
| 46 | 46 | static const char *PCP_CLIENT_VERSION_EX_PREFIX = "IM"; // 2bytes only |
| 47 | -static const int PCP_CLIENT_VERSION_EX_NUMBER = 37; | |
| 48 | -static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0037)"; | |
| 49 | -static const char *PCX_VERSTRING_EX = "v0.1218(IM0037)"; | |
| 47 | +static const int PCP_CLIENT_VERSION_EX_NUMBER = 38; | |
| 48 | +static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0038)"; | |
| 49 | +static const char *PCX_VERSTRING_EX = "v0.1218(IM0038)"; | |
| 50 | 50 | |
| 51 | 51 | static const char *PCP_CLIENT_DIST_URL = "http://peercastim.s353.xrea.com/"; |
| 52 | 52 | #endif |
| @@ -95,7 +95,7 @@ BEGIN | ||
| 95 | 95 | MENUITEM "PeerCast", ID_POPUP_SHOWMESSAGES_PEERCAST |
| 96 | 96 | MENUITEM "配信者", ID_POPUP_SHOWMESSAGES_BROADCASTERS |
| 97 | 97 | MENUITEM "トラック情報", ID_POPUP_SHOWMESSAGES_TRACKINFO |
| 98 | - MENUITEM "アップデート情報", ID_POPUP_POPUPMESSAGES_UPGRADEALERTS, CHECKED, GRAYED | |
| 98 | + MENUITEM "アップデート情報", ID_POPUP_SHOWGUI, CHECKED, GRAYED | |
| 99 | 99 | END |
| 100 | 100 | POPUP "高度" |
| 101 | 101 | BEGIN |
Fork