wangyix
011e7c2de2
removed debug code
2014-06-17 11:53:09 -07:00
wangyix
8187912384
added qDebug() check in SentPacketHistory for seq numbers
...
used (unsigned short int)1 instead of 1 when calculating
expectedSequence
2014-06-17 11:34:35 -07:00
Thijs Wenker
1e200c3b9c
The balance display didn't get over ~21.1 because the parsed json object int32 is maximal 2147483647, fixed this by parsing it from json to double.
2014-06-17 19:49:35 +02:00
wangyix
dc71f87ea4
edit nacks seem to be working;
...
added mutex for releaseQueuedPacket() to prevent duplicate packets being
queued up due to the steps of queueing the packet and clearing it not
being atomic.
2014-06-17 10:42:56 -07:00
wangyix
06f8464ec9
edit nacks ready for test; seq numbers sometimes repeat??
2014-06-16 17:17:48 -07:00
wangyix
18a9d74b88
changed OctreeEditPacketSender to queue packets for resend as nack is parsed
2014-06-16 16:35:30 -07:00
wangyix
5e37704772
SentPacketHistory now handles rollover
...
updated SentPacketHistory path in comments
2014-06-16 15:59:38 -07:00
wangyix
69c2a2d12b
moved SentPacketHistory to libraries/networking/src
2014-06-16 14:04:21 -07:00
wangyix
ebfd65dea8
added OctreeInboundPacketProcessor::process() override to send nack periodically
...
added code to remove dead nodes' stats in sendNackPackets()
2014-06-16 12:30:16 -07:00
wangyix
2b20720f51
added sendNackPackets() to OctreeInboundPacketProcessor
...
added rollover handling in _missingSequenceNumbers pruning; added
EditNack packet types; added getMyEditNackType() to OctreeServer
subclasses; added code to randomly skip edit packet sequence numbers for
testing in OctreeEditPacketSender
2014-06-16 09:57:05 -07:00
Stojce Slavkovski
f1e008853c
Merge branch 'master' of https://github.com/highfidelity/hifi into 19755
2014-06-15 12:36:14 +02:00
John Grosen
1a3de1ef28
Totally removed DataServerAccountInfo's JSON constructor
2014-06-13 15:01:20 -07:00
John Grosen
3af4e32c81
Now determines hasProfile from presence of username
2014-06-13 11:08:38 -07:00
wangyix
3d4fae4b3f
Revert "added code for AC to send nack packets; no locking yet"
...
This reverts commit 15bd0878c4
2014-06-13 09:58:56 -07:00
John Grosen
14f56310f6
Changed AccountManager to only rely on a proper OAuth response.
...
This involved making another request after the initial OAuth authorization.
Because of this now-two-step process, some methods and signals were renamed
to make their purpose more clear. Additionally, a _hasProfile member variable
was added to DataServerAccountInfo in order to allow for knowledge of whether
the profile elements had been fetched when being deserialized from disk.
Error handling for the whole process is still nonexistant.
2014-06-12 23:28:43 -07:00
Stojce Slavkovski
1959768513
Merge branch 'master' of https://github.com/highfidelity/hifi into 19755
2014-06-13 00:45:06 +02:00
Stephen Birarda
d689c6b39f
fix reference to attribute in STUN packet
2014-06-12 13:15:54 -07:00
wangyix
15bd0878c4
added code for AC to send nack packets; no locking yet
2014-06-12 11:37:05 -07:00
wangyix
7aef5edb8f
removed debug var
2014-06-11 15:27:24 -07:00
wangyix
0601c24b24
removed debug prints
2014-06-11 15:26:22 -07:00
wangyix
ac0b037f0f
removed connect(); put call into Application::nodeKilled
...
OctreePacketReceiver::nodeKilled() doesn't get called when
NodeList::nodeKilled() is emitted for some unknown reason
2014-06-11 15:25:00 -07:00
wangyix
2080cc3dee
removed debug variable
2014-06-11 11:59:15 -07:00
wangyix
decd6109fb
made nodeKilled signatures match
2014-06-11 11:57:54 -07:00
wangyix
760627003f
killNode() to nodeKilled()
2014-06-11 11:11:04 -07:00
wangyix
fc07ceb412
added killNode() slot for _packetCounts garbage collection
2014-06-11 10:54:44 -07:00
wangyix
01005dc792
Merge remote-tracking branch 'upstream/master'
2014-06-11 10:09:49 -07:00
wangyix
c6a9a8924d
changed NetworkPacket::_sendingNode to ::_node
2014-06-10 16:43:53 -07:00
wangyix
b96b6c9857
added default constructor for NetworkPacket
...
updated param comments in ReceivedPacketProcessor
2014-06-10 12:24:47 -07:00
wangyix
d84beee3e4
VoxelPacketProcessor -> OctreePacketProcessor
...
added nodes bookkeeping in ReceivedPacketProcessor; added check in
sendNack() to not send NACKs to nodes that have sent packets that are
waiting in the message queue.
2014-06-10 11:05:51 -07:00
Stojce Slavkovski
3a6cbc257c
Merge branch 'master' of https://github.com/worklist/hifi into 19755
2014-06-10 00:08:28 +02:00
Brad Hefta-Gaub
6cf30cf9d1
Merge pull request #3002 from wangyix/master
...
added code to nack and re-send dropped octree data packets
2014-06-09 13:52:21 -07:00
wangyix
aa694d6967
removed debug code
2014-06-09 12:35:26 -07:00
wangyix
529dd827a2
moved around code in sendNack() a bit
2014-06-09 12:00:19 -07:00
Andrzej Kapolka
e936697cf0
Merge pull request #2987 from leechfarm/master
...
Fix for users with some special characters in their password not being able to log in
2014-06-09 11:31:30 -07:00
Stojce Slavkovski
939f8c49de
return balance in satoshis
2014-06-08 15:55:16 +02:00
wangyix
b39559d860
packet recovery seems to be working
...
Seems to impact FPS a lot. OctreeSceneStats is not being locked (causes
freezing, need to find out why).
2014-06-06 17:44:30 -07:00
wangyix
d21a8e73ff
Merge remote-tracking branch 'upstream/master' into packet_recovery_pull
2014-06-06 15:05:29 -07:00
wangyix
0b1bffa83c
added random packet drops; ready to test
2014-06-06 15:03:54 -07:00
Stephen Birarda
6fdc5df47b
bump silent audio frame version
2014-06-06 11:50:36 -07:00
Stephen Birarda
b6b148cd9f
resolve conflicts on merge with upstream master
2014-06-06 11:31:16 -07:00
Stephen Birarda
7da091d2b4
initial hooks for stereo audio
2014-06-06 10:15:09 -07:00
wangyix
1a7e3a859c
started work on resending nacked packets
2014-06-05 18:00:58 -07:00
Joseph Gilley
c1d1a8de5c
Fix for users with some special characters in their password not being able to log in using the login overlay in the Interface.
2014-06-05 00:26:45 -04:00
wangyix
ebfc405d9d
more cleanup 3
2014-06-04 11:55:20 -07:00
wangyix
480efcbe76
more cleanup again
2014-06-04 11:31:44 -07:00
wangyix
25e2f28b02
more cleanup
2014-06-04 11:30:35 -07:00
wangyix
b452d08495
cleaned up debug statements
...
also reorganized MovingPercentile a little bit
2014-06-04 11:20:29 -07:00
wangyix
12ac6105f1
changed MovingMedian to MovingPercentile
2014-06-04 10:59:32 -07:00
wangyix
50746a6540
extra commit of previous commit?
2014-06-03 16:19:12 -07:00
wangyix
c851edd0ef
added MovingMedian class, but not using it
...
added packet type/time data collection to DatagramProcessor and
post-execution prints of that info.
2014-06-03 16:18:40 -07:00
wangyix
65508b2016
updated packet type version numbers
2014-05-29 11:42:35 -07:00
wangyix
c87c474877
removed debug info, cleaned code for pull req
2014-05-29 10:39:40 -07:00
wangyix
a0f9d2c106
Merge remote-tracking branch 'upstream/master'
2014-05-29 09:20:30 -07:00
wangyix
5d4b0df108
added flag,seq,st to EnvironmentData, untested
...
removed/commented out debug prints
2014-05-28 17:41:38 -07:00
wangyix
c799077379
added flag,seq,ts to ParticleErase and ModelErase
...
... this fixes unreasonable flight-time issue
2014-05-28 17:20:10 -07:00
wangyix
e89d33dc60
added if to not track ParticleErase packets
2014-05-27 18:02:49 -07:00
Stephen Birarda
9df0f2c1e5
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-23 17:38:28 -07:00
Stephen Birarda
714e29c887
fix credit amount in window title
2014-05-23 17:37:36 -07:00
Stephen Birarda
1b00cda068
don't use powf for credit conversions
2014-05-23 16:12:34 -07:00
Stephen Birarda
34eb0f9f43
make transaction amounts and balances signed 64-bit
2014-05-23 15:34:34 -07:00
Stephen Birarda
9acf377573
balances are 64-bit unsigned ints
2014-05-23 11:52:39 -07:00
Stephen Birarda
4f81bac742
add back a missing space in AccountManager
2014-05-22 17:16:42 -07:00
Stephen Birarda
164d3c5fb3
make sure balance is cleared on logout and re-launch
2014-05-22 15:06:16 -07:00
Stephen Birarda
79f09605d5
show credit balance in window title
2014-05-22 14:55:43 -07:00
Stephen Birarda
01e8d775f2
change node auth URL to data.highfidelity.io
2014-05-22 14:24:19 -07:00
Philip Rosedale
79ff87f7c5
Merge pull request #2891 from birarda/credits
...
initial pass at crediting ACs for work done
2014-05-21 12:09:48 -07:00
Stephen Birarda
1dddabb691
send and confirm transactions to assigned nodes from DS
2014-05-21 10:58:41 -07:00
ZappoMan
22a6e4679a
properly discard piggy back packets that don't match expected version
2014-05-20 16:19:14 -07:00
Stephen Birarda
13077e48f8
handle types larger than 255 for packetVersionAndHashMatch
2014-05-20 15:45:08 -07:00
ZappoMan
e7425a8128
support for models in root element
2014-05-20 15:20:27 -07:00
Stephen Birarda
8a1fdf3486
pass wallet UUID from AC to DS, cleanup noisy timer
2014-05-20 14:38:51 -07:00
Stephen Birarda
a9c2e3fe71
put back ssize_t definition
2014-05-20 11:56:06 -07:00
Stephen Birarda
2ef822d19d
remove more gnutls includes
2014-05-20 11:26:22 -07:00
Stephen Birarda
f22aaf21d2
remove GnuTLS include across repo
2014-05-20 10:56:34 -07:00
Stephen Birarda
e3dd6509d8
remove dependency on GnuTLS for later replacement with OpenSSL
2014-05-20 10:47:11 -07:00
Stephen Birarda
0e7615391c
don't look for GnuTLS from cmake
2014-05-20 10:35:04 -07:00
ZappoMan
18de6dddec
Merge branch 'master' of https://github.com/worklist/hifi into modelserver
2014-05-14 12:21:44 -07:00
Stephen Birarda
efdc61c612
Merge pull request #2849 from stojce/19597
...
added discourse key in shift operators
2014-05-14 10:00:37 -07:00
Stojce Slavkovski
8247e5a552
added discourse key in shift operators
2014-05-14 17:25:40 +02:00
Kai Ludwig
19404fe0e5
Changed start domain to sandbox. Changed start location to xyz: 6270, 211, 6000.
...
goHome behaviour is unchanged and will still just go to the start location keeping the currently select domain.
2014-05-14 07:10:31 +02:00
ZappoMan
02bb816d5a
Merge branch 'master' of https://github.com/worklist/hifi into modelserver
2014-05-13 09:44:49 -07:00
ZappoMan
106c8bffd8
first cut at animations in models
2014-05-09 16:08:06 -07:00
Stojce Slavkovski
a1c31522ba
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-08 20:09:36 +02:00
Atlante45
fd1f6befff
CR
2014-05-07 15:19:32 -07:00
Atlante45
40ed72989c
mute environment packet
2014-05-07 12:57:11 -07:00
Stojce Slavkovski
8ee282e7d2
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-06 22:01:48 +02:00
Andrzej Kapolka
2a32700a30
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-05 17:03:31 -07:00
Stephen Birarda
befe75a04c
fix broken audio-mixer stats
2014-05-05 14:03:14 -07:00
Andrzej Kapolka
e0400dbd9c
Working on allowing attachment models to be uploaded.
2014-05-04 15:23:31 -07:00
Stojce Slavkovski
c400630bc4
make post
2014-05-03 21:12:20 +02:00
Stojce Slavkovski
b2c1afe1bd
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-03 09:52:19 +02:00
Stojce Slavkovski
d3fecd7a31
store discourse api key
2014-05-02 22:16:19 +02:00
Stephen Birarda
aa2931d9bb
resolve conflicts on merge with upstream/master
2014-05-02 10:39:17 -07:00
Stephen Birarda
4936fb3857
expose access token from AccountManager
2014-05-02 10:34:29 -07:00
Stephen Birarda
7a1aa7ec89
keep track of all assignments to stop double agents
2014-05-01 13:50:39 -07:00
Stephen Birarda
d942054015
cleanup re-display of OAuthWebView
2014-05-01 12:44:42 -07:00
Stephen Birarda
ca2148178d
handle cleanup of OAuth web view when force closed
2014-05-01 12:01:08 -07:00
Stephen Birarda
7d3157b1a0
trust high fidelity root CA cert for OAuth redirect
2014-05-01 11:54:51 -07:00
Stephen Birarda
2f0e311a99
return OAuth URL to interface clients when OAuth enabled
2014-05-01 10:19:05 -07:00
ZappoMan
0182a6d895
models working end to end
2014-04-30 11:12:49 -07:00
ZappoMan
aac42058ac
first cut at modelserver
2014-04-30 09:25:52 -07:00
Atlante45
49eadac024
Bumped octree stats packet version
2014-04-29 13:52:07 -07:00
Ryan Huffman
45fdd00608
Merge remote-tracking branch 'upstream/master' into 19598
...
Conflicts:
interface/src/ui/FramelessDialog.h
2014-04-28 09:13:00 -07:00
Ryan Huffman
cbd5fbe9b3
Add loginFailed signal to AccountManager
2014-04-28 08:59:44 -07:00
Stephen Birarda
8e12c0d8e5
pass the owner scope to auth requests
2014-04-25 13:22:18 -07:00
Atlante45
ae566c55f6
Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday
2014-04-23 10:38:29 -07:00
AndrewMeadows
94fabf7875
Merge pull request #2709 from ZappoMan/shared_and_weak_pointers
...
Voxel/Particle Server Performance Improvements
2014-04-22 10:28:39 -07:00
Atlante45
ddf14b0842
Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday
2014-04-22 10:22:30 -07:00
ZappoMan
91d8e11393
return the bytes sent in writeDatagram() and writeUnverifiedDatagram()
2014-04-21 17:34:01 -07:00
Atlante45
fd20686f0f
Removed Systime.h includes
2014-04-21 17:23:06 -07:00
ZappoMan
7d18dbdfb8
more cleanup
2014-04-21 16:35:42 -07:00
Atlante45
681aab5bf0
Remove printf and replace them by qDebug()
2014-04-21 16:17:45 -07:00
ZappoMan
7798c6eb09
some debugging
2014-04-21 11:48:58 -07:00
ZappoMan
59cbda20c6
added some threading and event debugging
2014-04-20 19:48:17 -07:00
ZappoMan
334f688e4e
add support for sending unverified datagrams to nodes
2014-04-18 15:30:45 -07:00
ZappoMan
50f7db8fe1
quiet some debugging
2014-04-18 15:02:10 -07:00
ZappoMan
2c02178802
Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers
...
Conflicts:
assignment-client/src/AssignmentClient.cpp
assignment-client/src/AssignmentClient.h
libraries/shared/src/NodeList.cpp
2014-04-18 14:28:54 -07:00
Stephen Birarda
49e7842d25
push packet version to force an update
2014-04-16 13:37:41 -07:00
Stephen Birarda
505145f693
add a missing bracket to IP_DONTFRAG
2014-04-16 12:02:02 -07:00
Stephen Birarda
afcb542bbe
fix a debug line in LimitedNodeList
2014-04-16 11:28:34 -07:00
Stephen Birarda
06a976041b
take pointer of optValue and not actual optValue
2014-04-16 11:27:30 -07:00
Stephen Birarda
a25ef58247
move DTLS socket changes to LimitedNodeList
2014-04-16 11:25:35 -07:00
Stephen Birarda
57567becc8
fix unexpected null parameter to disconnect, closes, #2663
2014-04-16 11:02:08 -07:00
Stephen Birarda
97e45e8fe5
re-instate connect behavior in DS so killed nodes re-connect, amend #2675
2014-04-16 10:56:33 -07:00
Stephen Birarda
1cd5fec71c
push packet version for assignments
2014-04-11 11:42:33 -07:00
Stephen Birarda
6431d35f86
add a missing newline to DomainHandler
2014-04-11 10:19:31 -07:00
Stephen Birarda
86b0b78692
add a missing semi-colon for windows build
2014-04-10 12:27:52 -07:00
Stephen Birarda
9912c4c9a7
just call free instead of gnutls_free on windows
2014-04-10 12:24:41 -07:00
Stephen Birarda
38867a2f09
fix for re-declarations of xgnutls_free
2014-04-10 12:14:37 -07:00
Stephen Birarda
97444eac1c
put gnutls_free fix in DTLSSession header
2014-04-10 12:11:41 -07:00
Stephen Birarda
2c96ce08ae
add stackoverflow fix for lnk2001 error in gnutls_free
2014-04-10 11:50:26 -07:00
Stephen Birarda
7d4399da35
don't use reserved word causing issues on windows
2014-04-10 11:01:17 -07:00
Stephen Birarda
52203bd36e
another attempt to repair QNetworkInterface call on windows
2014-04-10 10:58:20 -07:00
Stephen Birarda
ad0776be4e
repair QNetworkConfigurationManager include
2014-04-10 10:55:02 -07:00
Stephen Birarda
714db42f87
include QNetworkConfigManager to fix HifiSockAddr error on windows
2014-04-10 10:51:20 -07:00
Stephen Birarda
da24483d7c
include WS2tcpip for socklen_t on windows
2014-04-10 10:45:43 -07:00
Stephen Birarda
b87c04444e
include winsock2 from HifiSockAddr
2014-04-10 10:41:01 -07:00
Stephen Birarda
8b19982e61
commit missing Syssocket removals to Node and Logging
2014-04-10 10:36:30 -07:00
Stephen Birarda
7cef2def66
remove Syssocket which is from our pre-Qt days
2014-04-10 10:34:31 -07:00
Stephen Birarda
54647f0f08
make sure gnutls define for ssize_t comes before gnutls include
2014-04-10 10:27:08 -07:00
Stephen Birarda
16bb28a4fa
make GnuTLS a system include to suppress warnings
2014-04-10 10:04:02 -07:00
Stephen Birarda
ba6f861ad8
fix unmatched #ifdef in Syssocket
2014-04-10 09:54:37 -07:00
Stephen Birarda
d5d52f804f
add a networking library and link from appropriate targets
2014-04-10 09:32:17 -07:00
