OLD | NEW |
1 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ | 1 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ |
2 /* | 2 /* |
3 * Copyright (c) 2007,2008,2009 INRIA, UDcast | 3 * Copyright (c) 2007,2008,2009 INRIA, UDcast |
4 * | 4 * |
5 * This program is free software; you can redistribute it and/or modify | 5 * This program is free software; you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 2 as | 6 * it under the terms of the GNU General Public License version 2 as |
7 * published by the Free Software Foundation; | 7 * published by the Free Software Foundation; |
8 * | 8 * |
9 * This program is distributed in the hope that it will be useful, | 9 * This program is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
629 NS_LOG_INFO ("\tNo service flows matches...using the default one."); | 629 NS_LOG_INFO ("\tNo service flows matches...using the default one."); |
630 } | 630 } |
631 | 631 |
632 NS_LOG_INFO ("\tPacket classified in the service flow SFID = " << serviceFlow
->GetSfid () << " CID = " | 632 NS_LOG_INFO ("\tPacket classified in the service flow SFID = " << serviceFlow
->GetSfid () << " CID = " |
633 << serviceFlow
->GetCid ()); | 633 << serviceFlow
->GetCid ()); |
634 if (serviceFlow->GetIsEnabled ()) | 634 if (serviceFlow->GetIsEnabled ()) |
635 { | 635 { |
636 if (!Enqueue (packet, MacHeaderType (), serviceFlow->GetConnection ())) | 636 if (!Enqueue (packet, MacHeaderType (), serviceFlow->GetConnection ())) |
637 { | 637 { |
638 NS_LOG_INFO ("\tEnqueue ERROR!!" ); | 638 NS_LOG_INFO ("\tEnqueue ERROR!!" ); |
639 m_ssTxDropTrace (packet); | 639 // Do not fire the drop trace if the packet will be re-queued by the q
ueue disc |
| 640 if (!IsQueueDiscInstalled ()) |
| 641 { |
| 642 m_ssTxDropTrace (packet); |
| 643 } |
640 return false; | 644 return false; |
641 } | 645 } |
642 else | 646 else |
643 { | 647 { |
644 m_ssTxTrace (packet); | 648 // Do not fire the drop trace if the packet will be re-queued by the q
ueue disc |
| 649 if (!IsQueueDiscInstalled ()) |
| 650 { |
| 651 m_ssTxTrace (packet); |
| 652 } |
645 } | 653 } |
646 } | 654 } |
647 else | 655 else |
648 { | 656 { |
649 NS_LOG_INFO ("Error!! The Service Flow is not enabled" ); | 657 NS_LOG_INFO ("Error!! The Service Flow is not enabled" ); |
650 m_ssTxDropTrace (packet); | 658 // Do not fire the drop trace if the packet will be re-queued by the queue
disc |
| 659 if (!IsQueueDiscInstalled ()) |
| 660 { |
| 661 m_ssTxDropTrace (packet); |
| 662 } |
651 return false; | 663 return false; |
652 } | 664 } |
653 | 665 |
654 return true; | 666 return true; |
655 } | 667 } |
656 | 668 |
657 bool | 669 bool |
658 SubscriberStationNetDevice::Enqueue (Ptr<Packet> packet, | 670 SubscriberStationNetDevice::Enqueue (Ptr<Packet> packet, |
659 const MacHeaderType &hdrType, | 671 const MacHeaderType &hdrType, |
660 Ptr<WimaxConnection> connection) | 672 Ptr<WimaxConnection> connection) |
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1278 if (GetState () == SS_STATE_STOPPED) | 1290 if (GetState () == SS_STATE_STOPPED) |
1279 { | 1291 { |
1280 Simulator::Cancel (eventId); // cancelling this event (already scheduled i
n function call) | 1292 Simulator::Cancel (eventId); // cancelling this event (already scheduled i
n function call) |
1281 return; | 1293 return; |
1282 } | 1294 } |
1283 | 1295 |
1284 event = eventId; | 1296 event = eventId; |
1285 } | 1297 } |
1286 | 1298 |
1287 } // namespace ns` | 1299 } // namespace ns` |
OLD | NEW |