i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed sending/receiving "use preferred handler" messages - it simply didn't

Browse Source 
work before.
* Removed the private header fPreferredTarget field.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15047 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-11-20 16:58:34 +00:00
parent 4ceb1e519c
commit 9e2023b10b
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/app/Message.cpp
+7 -18
View File
@@ -125,7 +125,6 @@ private:
port_id fReplyPort; port_id fReplyPort;
int32 fReplyToken; int32 fReplyToken;
team_id fReplyTeam; team_id fReplyTeam;
bool fPreferredTarget;
bool fReplyRequired; bool fReplyRequired;
bool fReplyDone; bool fReplyDone;
bool fIsReply; bool fIsReply;
@@ -199,7 +198,8 @@ BMessage::Header::ReadFrom(BDataIO &stream)
// Get the preferred flag // Get the preferred flag
read_helper(bigFlags); read_helper(bigFlags);
checksum_helper.Cache(bigFlags); checksum_helper.Cache(bigFlags);
fPreferredTarget = bigFlags; if (bigFlags)
fTargetToken = B_PREFERRED_TOKEN;
// Get the reply requirement flag // Get the reply requirement flag
read_helper(bigFlags); read_helper(bigFlags);
@@ -253,7 +253,6 @@ BMessage::Header::ReadFrom(const BMessage &message)
fReplyPort = message.fReplyTo.port; fReplyPort = message.fReplyTo.port;
fReplyToken = message.fReplyTo.target; fReplyToken = message.fReplyTo.target;
fReplyTeam = message.fReplyTo.team; fReplyTeam = message.fReplyTo.team;
fPreferredTarget = message.fPreferred;
fReplyRequired = message.fReplyRequired; fReplyRequired = message.fReplyRequired;
fReplyDone = message.fReplyDone; fReplyDone = message.fReplyDone;
fIsReply = message.fIsReply; fIsReply = message.fIsReply;
@@ -290,7 +289,7 @@ BMessage::Header::WriteTo(BDataIO &stream, bool calculateCheckSum) const
// Write targeting info if necessary // Write targeting info if necessary
if (!err && (fFlags & MSG_FLAG_INCL_TARGET)) { if (!err && (fFlags & MSG_FLAG_INCL_TARGET)) {
data = fPreferredTarget ? B_PREFERRED_TOKEN : fTargetToken; data = fTargetToken;
write_helper(&stream, (const void*)&data, sizeof (data), err); write_helper(&stream, (const void*)&data, sizeof (data), err);
} }
@@ -309,7 +308,7 @@ BMessage::Header::WriteTo(BDataIO &stream, bool calculateCheckSum) const
uint8 bigFlags; uint8 bigFlags;
if (!err) { if (!err) {
bigFlags = fPreferredTarget ? 1 : 0; bigFlags = fTargetToken == B_PREFERRED_TOKEN ? 1 : 0;
write_helper(&stream, (const void*)&bigFlags, sizeof(bigFlags), write_helper(&stream, (const void*)&bigFlags, sizeof(bigFlags),
err); err);
} }
@@ -344,13 +343,11 @@ BMessage::Header::WriteTo(BMessage &message) const
message.MakeEmpty(); message.MakeEmpty();
message.what = fWhat; message.what = fWhat;
message.fHasSpecifiers = fFlags & MSG_FLAG_SCRIPT_MSG; message.fHasSpecifiers = fFlags & MSG_FLAG_SCRIPT_MSG;
if (fFlags & MSG_FLAG_INCL_TARGET) { message.fPreferred = fTargetToken == B_PREFERRED_TOKEN;
// Get the target data message.fTarget = fTargetToken;
message.fTarget = fTargetToken;
}
if (fFlags & MSG_FLAG_INCL_REPLY) { if (fFlags & MSG_FLAG_INCL_REPLY) {
// Get the reply port // Get the reply port
message.fReplyTo.port = fReplyPort; message.fReplyTo.port = fReplyPort;
@@ -359,10 +356,6 @@ BMessage::Header::WriteTo(BMessage &message) const
message.fWasDelivered = true; message.fWasDelivered = true;
message.fPreferred = fPreferredTarget;
if (fPreferredTarget)
message.fTarget = B_PREFERRED_TOKEN;
message.fReplyRequired = fReplyRequired; message.fReplyRequired = fReplyRequired;
message.fReplyDone = fReplyDone; message.fReplyDone = fReplyDone;
message.fIsReply = fIsReply; message.fIsReply = fIsReply;
@@ -409,8 +402,6 @@ BMessage::Header::SetTarget(int32 token)
fFlags &= ~MSG_FLAG_INCL_TARGET; fFlags &= ~MSG_FLAG_INCL_TARGET;
else else
fFlags |= MSG_FLAG_INCL_TARGET; fFlags |= MSG_FLAG_INCL_TARGET;
fPreferredTarget = token == B_PREFERRED_TOKEN;
} }
// Dump // Dump
@@ -426,7 +417,6 @@ BMessage::Header::Dump() const
printf(" reply port: %ld\n", fReplyPort); printf(" reply port: %ld\n", fReplyPort);
printf(" reply token: %ld\n", fReplyToken); printf(" reply token: %ld\n", fReplyToken);
printf(" reply team: %ld\n", fReplyTeam); printf(" reply team: %ld\n", fReplyTeam);
printf(" preferred target: %d\n", fPreferredTarget);
printf(" reply required: %d\n", fReplyRequired); printf(" reply required: %d\n", fReplyRequired);
printf(" reply done: %d\n", fReplyDone); printf(" reply done: %d\n", fReplyDone);
printf(" is reply: %d\n", fIsReply); printf(" is reply: %d\n", fIsReply);
@@ -1801,7 +1791,6 @@ BMessage::real_flatten(char* result, ssize_t size) const
{ {
BMemoryIO stream((void*)result, size); BMemoryIO stream((void*)result, size);
return real_flatten(&stream); return real_flatten(&stream);
} }