Skip to content

Commit

Permalink
fix filetransfer rcv bug with eos
Browse files Browse the repository at this point in the history
  • Loading branch information
@RJ
RJ committed Mar 2, 2009
1 parent 2e6b81a commit f262ee0
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 28 deletions.
10 changes: 3 additions & 7 deletions playdar-daemon/playdar.kdevelop
View file
Expand Up @@ -159,8 +159,8 @@
<includestyle>3</includestyle> <includestyle>3</includestyle>
<root></root> <root></root>
<designerintegration>EmbeddedKDevDesigner</designerintegration> <designerintegration>EmbeddedKDevDesigner</designerintegration>
<qmake>/usr/local/Trolltech/Qt-4.4.3/bin/qmake</qmake> <qmake>/usr/bin/qmake</qmake>
<designer>/usr/local/Trolltech/Qt-4.4.3/bin/designer</designer> <designer>/usr/bin/designer</designer>
<designerpluginpaths/> <designerpluginpaths/>
</qt> </qt>
<codecompletion> <codecompletion>
Expand Down Expand Up @@ -199,11 +199,7 @@
<synchronize>true</synchronize> <synchronize>true</synchronize>
<orientation>Vertical</orientation> <orientation>Vertical</orientation>
</splitheadersource> </splitheadersource>
<references> <references/>
<pcs>cpp%20stuff,%20stl</pcs>
<pcs>boost</pcs>
<pcs>moost</pcs>
</references>
</kdevcppsupport> </kdevcppsupport>
<cppsupportpart> <cppsupportpart>
<filetemplates> <filetemplates>
Expand Down
Binary file modified playdar-daemon/playdar.kdevelop.pcs
View file
Binary file not shown.
89 changes: 78 additions & 11 deletions playdar-daemon/playdar.kdevses
View file
@@ -1,19 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version = '1.0' encoding = 'UTF-8'?>
<!DOCTYPE KDevPrjSession> <!DOCTYPE KDevPrjSession>
<KDevPrjSession> <KDevPrjSession>
<DocsAndViews NumberOfDocuments="4" > <DocsAndViews NumberOfDocuments="25" >
<Doc0 NumberOfViews="1" URL="file:///home/rj/src/playdar-git/playdar-daemon/src/tools/search.cpp" > <Doc0 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/resolvers/darknet/connection.hpp" >
<View0 Encoding="" line="0" Type="Source" /> <View0 Encoding="" line="173" Type="Source" />
</Doc0> </Doc0>
<Doc1 NumberOfViews="1" URL="file:///home/rj/src/playdar-git/playdar-daemon/src/scanner/build.sh" > <Doc1 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/resolvers/darknet/msgs.h" >
<View0 Encoding="" line="0" Type="Source" /> <View0 Encoding="" line="22" Type="Source" />
</Doc1> </Doc1>
<Doc2 NumberOfViews="1" URL="file:///home/rj/src/playdar-git/playdar-daemon/src/resolvers/send.php" > <Doc2 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/resolvers/darknet/servent.cpp" >
<View0 Encoding="" line="0" Type="Source" /> <View0 Encoding="" line="58" Type="Source" />
</Doc2> </Doc2>
<Doc3 NumberOfViews="1" URL="file:///home/rj/src/playdar-git/playdar-daemon/src/playdar/main.cpp" > <Doc3 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/resolvers/darknet/servent.h" >
<View0 Encoding="" line="180" Type="Source" /> <View0 Encoding="" line="17" Type="Source" />
</Doc3> </Doc3>
<Doc4 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/resolvers/rs_lan_udp.h" >
<View0 Encoding="" Type="Source" />
</Doc4>
<Doc5 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/resolvers/darknet/rs_darknet.h" >
<View0 Encoding="" Type="Source" />
</Doc5>
<Doc6 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/resolvers/darknet/rs_darknet.cpp" >
<View0 Encoding="" line="19" Type="Source" />
</Doc6>
<Doc7 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/resolvers/rs_lan_udp.cpp" >
<View0 Encoding="" Type="Source" />
</Doc7>
<Doc8 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/resolvers/resolver_query.h" >
<View0 Encoding="" line="30" Type="Source" />
</Doc8>
<Doc9 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/application/application.cpp" >
<View0 Encoding="" Type="Source" />
</Doc9>
<Doc10 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/application/application.h" >
<View0 Encoding="" Type="Source" />
</Doc10>
<Doc11 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/playdar/main.cpp" >
<View0 Encoding="" line="28" Type="Source" />
</Doc11>
<Doc12 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/resolvers/resolver.cpp" >
<View0 Encoding="" line="68" Type="Source" />
</Doc12>
<Doc13 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/resolvers/resolver.h" >
<View0 Encoding="" Type="Source" />
</Doc13>
<Doc14 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/playdar/playdar_request_handler.cpp" >
<View0 Encoding="" line="204" Type="Source" />
</Doc14>
<Doc15 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/resolvers/rs_local_library.cpp" >
<View0 Encoding="" Type="Source" />
</Doc15>
<Doc16 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/resolvers/rs_local_library.h" >
<View0 Encoding="" line="12" Type="Source" />
</Doc16>
<Doc17 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/resolvers/playable_item.h" >
<View0 Encoding="" line="0" Type="Source" />
</Doc17>
<Doc18 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/resolvers/ss_http.h" >
<View0 Encoding="" line="22" Type="Source" />
</Doc18>
<Doc19 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/resolvers/ss_localfile.h" >
<View0 Encoding="" line="28" Type="Source" />
</Doc19>
<Doc20 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/resolvers/darknet/ss_darknet.h" >
<View0 Encoding="" line="50" Type="Source" />
</Doc20>
<Doc21 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/resolvers/resolver_service.cpp" >
<View0 Encoding="" Type="Source" />
</Doc21>
<Doc22 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/resolvers/resolver_service.h" >
<View0 Encoding="" line="27" Type="Source" />
</Doc22>
<Doc23 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/scanner/scanner.cpp" >
<View0 Encoding="" line="45" Type="Source" />
</Doc23>
<Doc24 NumberOfViews="1" URL="file:///home/rj/src/playdar/playdar-daemon/src/library/library.cpp" >
<View0 Encoding="" line="78" Type="Source" />
</Doc24>
</DocsAndViews> </DocsAndViews>
<pluginList> <pluginList>
<kdevdebugger> <kdevdebugger>
Expand All @@ -25,7 +88,11 @@
<AStyle IndentPreprocessors="0" FillCount="4" PadParenthesesOut="1" IndentNamespaces="1" IndentLabels="1" Fill="Tabs" MaxStatement="40" Brackets="Break" MinConditional="-1" IndentBrackets="0" PadParenthesesUn="1" BlockBreak="0" KeepStatements="1" KeepBlocks="1" BlockIfElse="0" IndentSwitches="1" PadOperators="0" FStyle="UserDefined" IndentCases="0" FillEmptyLines="0" BracketsCloseHeaders="0" BlockBreakAll="0" PadParenthesesIn="1" IndentClasses="1" IndentBlocks="0" FillForce="0" /> <AStyle IndentPreprocessors="0" FillCount="4" PadParenthesesOut="1" IndentNamespaces="1" IndentLabels="1" Fill="Tabs" MaxStatement="40" Brackets="Break" MinConditional="-1" IndentBrackets="0" PadParenthesesUn="1" BlockBreak="0" KeepStatements="1" KeepBlocks="1" BlockIfElse="0" IndentSwitches="1" PadOperators="0" FStyle="UserDefined" IndentCases="0" FillEmptyLines="0" BracketsCloseHeaders="0" BlockBreakAll="0" PadParenthesesIn="1" IndentClasses="1" IndentBlocks="0" FillForce="0" />
</kdevastyle> </kdevastyle>
<kdevbookmarks> <kdevbookmarks>
<bookmarks/> <bookmarks>
<bookmark url="/home/rj/src/playdar/playdar-daemon/src/resolvers/darknet/rs_darknet.cpp" >
<mark line="35" />
</bookmark>
</bookmarks>
</kdevbookmarks> </kdevbookmarks>
<kdevvalgrind> <kdevvalgrind>
<executable path="" params="" /> <executable path="" params="" />
Expand Down
3 changes: 1 addition & 2 deletions playdar-daemon/src/resolvers/darknet/rs_darknet.cpp
View file
Expand Up @@ -323,8 +323,7 @@ RS_darknet::handle_sidrequest(connection_ptr conn, msg_ptr msg)
cout << "-> source: '"<< pip->source() <<"'" << endl; cout << "-> source: '"<< pip->source() <<"'" << endl;
// We send SIDDATA msgs, where the payload is a sid_header followed // We send SIDDATA msgs, where the payload is a sid_header followed
// by the audio data. // by the audio data.
//char buf[8194]; char buf[8194]; // this is the lamemsg payload.
char buf[1024]; // this is the lamemsg payload.
int len, total=0; int len, total=0;
sid_header sheader; sid_header sheader;
memcpy((char*)&sheader.sid, sid.c_str(), 36); memcpy((char*)&sheader.sid, sid.c_str(), 36);
Expand Down
23 changes: 15 additions & 8 deletions playdar-daemon/src/resolvers/darknet/ss_darknet.h
View file
Expand Up @@ -36,23 +36,30 @@ class DarknetStreamingStrategy : public StreamingStrategy
cout << "Waiting for SIDDATA message..." << endl; cout << "Waiting for SIDDATA message..." << endl;
m_cond.wait(lk); m_cond.wait(lk);
} }
if(m_finished) //cout << "Got data to send, max available: "<< m_data.size() << endl;
if(!m_data.empty())
{
int sent = 0;
for(; !m_data.empty() && (sent < size); sent++)
{
*(buf+sent) = m_data.front();
m_data.pop_front();
}
if(sent) return sent;
}
else if(m_finished)
{ {
cout << "End of stream marker reached. " cout << "End of stream marker reached. "
<< m_numrcvd << " bytes rcvd total" << endl; << m_numrcvd << " bytes rcvd total" << endl;
cout << "Current size of output buffer: " << m_data.size() << endl; cout << "Current size of output buffer: " << m_data.size() << endl;
assert(m_data.size()==0); assert(m_data.size()==0);
return 0; return 0;
} }
//cout << "Got data to send, max available: "<< m_data.size() << endl; else
int sent = 0;
for(; !m_data.empty() && sent < size; sent++)
{ {
*(buf+sent) = m_data.front(); assert(0); // wtf.
m_data.pop_front(); return 0;
} }
//cout << "read_bytes provided " << sent << " bytes" << endl;
return sent;
} }


string debug() string debug()
Expand Down

0 comments on commit f262ee0

Please sign in to comment.