Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop networking #3

Open
wants to merge 77 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
ca5772a
Add project folder and some initial files
bibekdahal Dec 8, 2014
402f5de
added a couple of lines to test
Dec 8, 2014
9601316
aina
Dec 8, 2014
33232d9
Merge branch 'develop' of https://github.com/coders-circle/Mirror int…
Dec 8, 2014
1fbf7da
updated .gitignore for ignoring .out and .o files
Dec 8, 2014
3299c5e
Merge branch 'develop' of https://github.com/coders-circle/Mirror int…
Dec 8, 2014
60086fe
corrected solution name
frozenhelium Dec 9, 2014
7da37b3
Add some boost headers to common.h
bibekdahal Dec 9, 2014
1160a78
Add an empty RtpStreamer class
bibekdahal Dec 9, 2014
8c55aef
Add RtpTransmitter class
bibekdahal Dec 9, 2014
4ea324a
Add RtpReceiver class
bibekdahal Dec 9, 2014
ad69dc6
created a class tcpconnection but zero members
Dec 9, 2014
535a98f
Merge branch 'develop' of https://github.com/coders-circle/Mirror int…
Dec 9, 2014
be35cb3
created class TcpTransmitter with very few functions
Dec 10, 2014
3b76e77
completed FrameRenderer class
frozenhelium Dec 10, 2014
f5ec442
merged conflicts
frozenhelium Dec 10, 2014
72e0428
created TcpTransmitter and TcpReceiver, and created header for TcpHan…
Dec 10, 2014
59c4c54
Merge branch 'develop' of https://github.com/coders-circle/Mirror int…
Dec 10, 2014
d684b59
Set paths for GTK for Release Configuration
bibekdahal Dec 10, 2014
2ba1032
Added a makefile(empty) and TcpHandler.cpp(some code written)
Dec 10, 2014
600c8f8
Some work on Video Capturing
frozenhelium Dec 11, 2014
48527fc
Merge branch 'develop' of https://github.com/coders-circle/Mirror.git
frozenhelium Dec 11, 2014
84e9e44
Add TcpListener
bibekdahal Dec 11, 2014
7ffef1d
for the sake of sync
frozenhelium Dec 11, 2014
0685eed
confilicts resolved, improved filter structure
frozenhelium Dec 11, 2014
de07750
Add TcpClient
bibekdahal Dec 11, 2014
4eb4bdf
Merge branch 'develop' of https://github.com/coders-circle/Mirror.git
bibekdahal Dec 11, 2014
9f33950
reinserted VideoCapture.h
frozenhelium Dec 11, 2014
efbe765
Merge branch 'develop' of https://github.com/coders-circle/Mirror.git
bibekdahal Dec 11, 2014
bd6ada0
Add TcpClient
bibekdahal Dec 11, 2014
7b03891
almost done TcpHandler, rest by B. Dahal
Dec 11, 2014
ef76de6
Merge branch 'develop' of https://github.com/coders-circle/Mirror int…
Dec 11, 2014
3a4ac74
TcpHandler corrected
bibekdahal Dec 11, 2014
214f5a7
Tcp Send Receive Test
bibekdahal Dec 12, 2014
5e8890d
nothing significant
Dec 13, 2014
8f364bc
Merge branch 'develop-networking' of https://github.com/coders-circle…
Dec 13, 2014
96467bd
Add ChatMessage, Combine Rtp classes into single RtpHandler
bibekdahal Dec 13, 2014
1ec6dbe
Merge branch 'develop-networking' of https://github.com/coders-circle…
Dec 13, 2014
1975be1
Add group connection through server
bibekdahal Dec 13, 2014
aaf2cc5
Merge branch 'develop-networking' of https://github.com/coders-circle…
Dec 13, 2014
c71a4ec
Add Group-Chat functionality
bibekdahal Dec 13, 2014
f882fd3
balla balla kaam garne makefile banyo
Dec 13, 2014
70faccc
Merge branch 'develop-networking' of https://github.com/coders-circle…
Dec 13, 2014
e2ab7e8
Add automatic free port detection and manual input of server IP
bibekdahal Dec 14, 2014
c4f1d78
Server default port changed to 10011
bibekdahal Dec 14, 2014
a0e7b94
okie, some changes
frozenhelium Dec 15, 2014
2c1d361
just for sync
frozenhelium Dec 15, 2014
2202ab8
Add rapidjson
bibekdahal Dec 16, 2014
536914a
Bug found and fixed
bibekdahal Dec 16, 2014
77300aa
for sync
frozenhelium Dec 16, 2014
825be01
Merge branch 'develop-networking' of https://github.com/coders-circle…
frozenhelium Dec 16, 2014
82eb954
update makefile
Dec 16, 2014
1cf55f7
Merge branch 'develop-networking' of https://github.com/coders-circle…
Dec 16, 2014
139a8f7
for sync
frozenhelium Dec 16, 2014
b87230b
Merge branch 'develop-networking' of https://github.com/coders-circle…
frozenhelium Dec 16, 2014
b623596
renamed strcpy_s to strcpy
Dec 16, 2014
6550378
Add name input
bibekdahal Dec 16, 2014
433d877
Merge branch 'develop-networking' of https://github.com/coders-circle…
bibekdahal Dec 16, 2014
499e137
Merge branch 'develop-networking' of https://github.com/coders-circle…
Dec 16, 2014
904708f
P2P connection feature added
bibekdahal Dec 20, 2014
7a6b0e5
Simple TCP hole punching... remains to be tested
bibekdahal Dec 25, 2014
3d57559
Few Bugs Fixed
bibekdahal Dec 25, 2014
599dd15
okie what is this!!! zzz
frozenhelium Dec 25, 2014
80e04e6
Revert "okie what is this!!! zzz"
frozenhelium Dec 25, 2014
e885895
Revert "Simple TCP hole punching... remains to be tested"
frozenhelium Dec 25, 2014
be37c10
okie, something bad happend and I had to revert :/
frozenhelium Dec 25, 2014
b4bf1f4
Rerverting the faulty commits
bibekdahal Dec 26, 2014
861d8cc
Few Improvements
bibekdahal Dec 27, 2014
33b72d0
Add UdpHandler class
bibekdahal Dec 28, 2014
641de50
some part of HttpHandler class
Dec 29, 2014
b797b41
Client Event Handlers added
bibekdahal Dec 29, 2014
159edcd
Few errors fixed
bibekdahal Dec 29, 2014
8729ff1
little modifications
Dec 29, 2014
3f5ce0d
Merge branch 'develop-networking' of https://github.com/coders-circle…
Dec 29, 2014
a2e4b7a
nothing at all
Dec 29, 2014
807710b
json can now be read from server
Dec 30, 2014
5112155
the end of response from server is marked '<<>>'
Jan 1, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 63 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto

###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp

###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary

###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary

###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain
162 changes: 162 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

#linux executables and object files
*.out
*.o
#swp files
*.swp
# User-specific files
*.suo
*.user
*.sln.docstates

# Build results

[Dd]ebug/
[Rr]elease/
x64/
build/
[Bb]in/
[Oo]bj/

# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
!packages/*/build/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.log
*.scc

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
*.cachefile

# Visual Studio profiler
*.psess
*.vsp
*.vspx

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
*.ncrunch*
.*crunch*.local.xml

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.Publish.xml

# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
#packages/

# Windows Azure Build Output
csx
*.build.csdef

# Windows Store app package directory
AppPackages/

# Others
sql/
*.Cache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.[Pp]ublish.xml
*.pfx
*.publishsettings

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
App_Data/*.mdf
App_Data/*.ldf


#LightSwitch generated files
GeneratedArtifacts/
_Pvt_Extensions/
ModelManifest.xml

# =========================
# Windows detritus
# =========================

# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Mac desktop service store files
.DS_Store
/MSVC_2013/Mirror-Client
99 changes: 99 additions & 0 deletions MSVC_2013/Mirror-Client/Mirror-Client.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{C3B011C9-AB6A-467B-B72D-DBF24A92B057}</ProjectGuid>
<RootNamespace>MirrorClient</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ExecutablePath>$(ExecutablePath)</ExecutablePath>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(OPENCV_ROOT)\include;$(GTKDIR)\include\gail-3.0;$(GTKDIR)\include\atk-1.0;$(GTKDIR)\include\gdk-pixbuf-2.0;$(SolutionDir)\..\include;$(BOOST_ROOT);$(GTKDIR)\include\gtk-3.0;$(GTKDIR)\include\glib-2.0;$(GTKDIR)\include\pango-1.0;$(GTKDIR)\lib\glib-2.0\include;$(GTKDIR)\include\cairo</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN32_WINNT=0x0501;_MBCS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(BOOST_ROOT)\stage\lib;$(GTKDIR)\lib;$(OPENCV_ROOT)\lib;</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(OPENCV_ROOT)\build\include;$(GTKDIR)\include\gail-3.0;$(GTKDIR)\include\atk-1.0;$(GTKDIR)\include\gdk-pixbuf-2.0;$(SolutionDir)\..\include;$(BOOST_ROOT);$(GTKDIR)\include\gtk-3.0;$(GTKDIR)\include\glib-2.0;$(GTKDIR)\include\pango-1.0;$(GTKDIR)\lib\glib-2.0\include;$(GTKDIR)\include\cairo</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN32_WINNT=0x0501;_MBCS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>$(BOOST_ROOT)\stage\lib;$(GTKDIR)\lib;$(OPENCV_ROOT)\lib;</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\include\client\Client.h" />
<ClInclude Include="..\..\include\common\ChatMessage.h" />
<ClInclude Include="..\..\include\common\common.h" />
<ClInclude Include="..\..\include\common\Exception.h" />
<ClInclude Include="..\..\include\common\TcpAcceptor.h" />
<ClInclude Include="..\..\include\common\TcpRequest.h" />
<ClInclude Include="..\..\include\common\RtpHandler.h" />
<ClInclude Include="..\..\include\common\TcpHandler.h" />
<ClInclude Include="..\..\include\common\UdpHandler.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\client\main.cpp" />
<ClCompile Include="..\..\src\client\Client.cpp" />
<ClCompile Include="..\..\src\common\ChatMessage.cpp" />
<ClCompile Include="..\..\src\common\TcpAcceptor.cpp" />
<ClCompile Include="..\..\src\common\TcpRequest.cpp" />
<ClCompile Include="..\..\src\common\RtpHandler.cpp" />
<ClCompile Include="..\..\src\common\TcpHandler.cpp" />
<ClCompile Include="..\..\src\common\UdpHandler.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
Loading