Skip to content

Commit

Permalink
add password input; rename packages; update libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
andiwand committed Apr 14, 2015
1 parent 3cceeb2 commit 3b64c7a
Show file tree
Hide file tree
Showing 91 changed files with 611 additions and 428 deletions.
8 changes: 4 additions & 4 deletions .classpath
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="at/andiwand/packettracer/bridge/traverser/translator/TCPTranslator2.java" kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/common.jar"/>
<classpathentry kind="lib" path="lib/packetsocket.jar"/>
<classpathentry excluding="at/andiwand/packettracer/bridge/traverser/translator/TCPTranslator2.java|at/stefl/ptbridge/traverser/translator/TCPTranslator2.java" kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-7-openjdk-amd64-root"/>
<classpathentry kind="lib" path="lib/packetsocket.jar" sourcepath="/packetsocket"/>
<classpathentry kind="lib" path="lib/commons.jar" sourcepath="/commons"/>
<classpathentry kind="output" path="bin"/>
</classpath>
5 changes: 5 additions & 0 deletions cap/packettracer/6.1.0.0120/dhcp.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Requests:
| 1 | 1 | 1 | 6 | 0 | 1913221C | 0 | -32768 | 0.0.0.0 | 0.0.0.0 | 0.0.0.0 | 0.0.0.0 | 0.0.0.0 | 0001.C7C8.26EE | | | 1 | DhcpOptionClientIdentifier | 61 | 61 | 0 | 1 | 0001.C7C8.26EE | 0 | 0 | 0 | 0.0.0.0 |
| 1 | 1 | 1 | 6 | 0 | 8E503D68 | 0 | -32768 | 0.0.0.0 | 0.0.0.0 | 0.0.0.0 | 0.0.0.0 | 0.0.0.0 | 0001.C7C8.26EE | | | 1 | DhcpOptionClientIdentifier | 61 | 61 | 0 | 1 | 0001.C7C8.26EE | 0 | 0 | 0 | 0.0.0.0 |

| operation type | hardware type? | hardware type? | address length | hops? | connection id | startup time | flags | client ip | your ip | server ip | gateway ip | subnet mask | client hardware address | server name | file name | tftp server ip | ? | ? | dns server ip |
Binary file removed lib/common.jar
Binary file not shown.
16 changes: 0 additions & 16 deletions lib/common.jardesc

This file was deleted.

Binary file added lib/commons.jar
Binary file not shown.
Binary file modified lib/packetsocket.jar
Binary file not shown.
17 changes: 0 additions & 17 deletions lib/packetsocket.jardesc

This file was deleted.

Binary file removed packettracer-bridge.jar
Binary file not shown.
File renamed without changes.
File renamed without changes.
107 changes: 107 additions & 0 deletions spec/6.1.0.0120/protocol_definitions.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
CEthernetIIHeader

binary
| mac | mac | short | int |

logical
| src mac | dst mac | ? | type |


CArpPacket

binary
| short | short | byte | byte | short | - | - | - | - |

logical
| l2 add type | l3 add type | l2 add size | l3 add size | operation | src l2 add | dst l2 add | src l3 add | dst l3 add |


CIpHeader

binary
| byte | byte | byte | short | short | byte | short | short | short | short | int | int | ip4 | ip4 |

logical
| version | IHL | TOS | total length | identifier | flags | fragment offset | ttl | protocol | checksum | ? | ? | src ip | dst ip |


CIcmpHeader

binary
| byte | byte | short | short | short |

logical
| type | code | checksum | identifier | sequence number |


CTcpHeader

binary
| short | short | ? | int | int | byte | byte | byte | short | short | short | int | int |

logical
| src port | dst port | ? | sequence number | acknowledgment number | ? | flags | ? | ? | ? | ? | options flag? |


CUdpHeader

binary
| short | short | short | short |

logical
| src port | dst port | length | checksum |


CDhcpPacket

binary
| byte? | byte? | byte? | byte? | byte? | string | short | short | int | int | int | ip4 | ip4 | ip4 | ip4 | ip4 | - | string | string | ipv4 | int | string | ipv4 |

logical
| message type | ? | ? | ? | ? | connection id | startup time | flags | ? | ? | ? | client ip | your ip | server ip | gateway ip | subnet mask | client hardware address | server name | file name | tftp server ip | ? | ? | dns server ip |


CDnsMessage

/*
* CDnsHeader, 13827, false, 1, false, false, true, false, 0, 1, 0, 0,
* test.local, 4, 1, 86400, 0, -4713, 1, 1, 0, 0, 0, 0, false, 0, 0, 0
*
* CDnsHeader, 16844, true, 1, false, false, true, false, 0, 1, 1, 0,
* test.local, 4, 1, 86400, 0, -4713, 1, 1, 0, 0, 0, 0, false, 1,
* test.local, 4, 1, 86400, 4, -4713, 1, 1, 0, 0, 0, 0, true, 192.168.15.101,
* 0, 0
*
* CDnsHeader, 43966, true, 1, false, false, true, false, 0, 1, 2, 0,
* t.local, 4, 1, 86400, 0, -4713, 1, 1, 0, 0, 0, 0, false, 2,
* t.local, 0, 1, 86400, 10, -4713, 1, 1, 0, 0, 0, 0, true, true,
* test.local, 4, 1, 86400, 4, -4713, 1, 1, 0, 0, 0, 0, true, 192.168.15.101,
* 0, 0
*
* header
* CDnsHeader, 16844, true, 1, false, false, true, false, 0, 1, 1, 0
* entry
* test.local, 4, 1, 86400, 0, -4713, 1, 1, 0, 0, 0, 0, false, 1
* trailing
* 0, 0
*
* header
* CDnsHeader, id, response, operation code, aa, tc,
* rd, ra, aa count, tc count, rd count, ra count
* entry
* domain name, type?, class, time to live, data length?,
* ?, 1, 1, 0, 0, 0, 0, payload y/n?, payload
* trailing
* 0, 0
*/


CSnmpPdu

| type | request id | error status | error index | variable bindings | item1 | item-name1 | ?1 (=14) | value1 | ... | version | community |

type
0 get request
1 get bulk request
2 get response
3 set request
File renamed without changes.
34 changes: 34 additions & 0 deletions spec/prev/link.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
type | ? | changeType | linkId | linkUuid | ? | linkType | linkName | interfaceType | interfaceUp/Down | interfaceCrossing | ? | bandwidth | fullduplex/halfduplex | ? | auto bandwidth | auto duplex | clock rate | dce/dte | ? | ? | ? | ? | device up/down
int | int | int | int | uuid | int | int | string | int | bool | bool | bool | int | bool | bool | bool | bool | int | bool | int | int | bool | bool | bool

example
--------
203 | 0 | 0 | 0 | {ae0cb655-ade6-4c7c-9448-a935ee126909} | -1 | 1 | Router0 FastEthernet0/0 | 3 | false | false | false | 100000 | false | true | true | true | 0 | false | 1 | 1 | false | false | true


changeType
0 new
1 old
2 remove

linkType
0 none
1 straight through
2 cross over
3 console
4 fiber
5 serial
6 phone
7 coaxial

interfaceType
0 console
2 copper ehternet
3 copper fast ethernet
4 copper gigabit ethernet
5 fiber fast ethernet
6 fiber gigabit ethernet
7 serial (a/s)
8 serial
18 analog phone
21 coaxial
49 changes: 49 additions & 0 deletions spec/prev/multiuser_connection.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
multiuser request (type 200)
----

int | string | uuid
type | username | multiuser_uuid

example
200 | "Guest" | {C1D64EF0-61FB-44F4-9C81-AE7EA8EBBCD8}



multiuser response (type 201)
----

int | string | uuid
type | username | multiuser_uuid

example
201 | "Guest" | {216641EC-916D-415F-B00B-AD14C4AE4E40}



multiuser status (type 202)
----

int | int
type | status

example
202 | 0



multiuser link (type 203)
----

int | int | int | uuid | ...
type | ? | linkID | linkUUID | ...



multiuser network (type 210)
----

int | string
type | network_name

example
210 | "Peer0"
File renamed without changes.
10 changes: 0 additions & 10 deletions src/at/andiwand/packettracer/bridge/ptmp/PTMPPacketListener.java

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package at.andiwand.packettracer.bridge.io;
package at.stefl.ptbridge.io;

import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
Expand All @@ -7,8 +7,8 @@
import java.net.Inet6Address;
import java.util.UUID;

import at.andiwand.library.network.mac.MACAddress;
import at.andiwand.library.util.UUIDUtil;
import at.stefl.commons.network.mac.MACAddress;
import at.stefl.commons.util.UUIDUtil;


public class ExtendedDataReader {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package at.andiwand.packettracer.bridge.io;
package at.stefl.ptbridge.io;

import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
Expand All @@ -7,8 +7,8 @@
import java.net.Inet6Address;
import java.util.UUID;

import at.andiwand.library.network.mac.MACAddress;
import at.andiwand.library.util.UUIDUtil;
import at.stefl.commons.network.mac.MACAddress;
import at.stefl.commons.util.UUIDUtil;


public class ExtendedDataWriter {
Expand Down
Loading

0 comments on commit 3b64c7a

Please sign in to comment.