Skip to content

Commit 7437577

Browse files
committed
feat(MAC Address Converter): add EUI-64 and IPv6 support
Fix CorentinTh#1146
1 parent d14371c commit 7437577

File tree

3 files changed

+106
-7
lines changed

3 files changed

+106
-7
lines changed
Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,30 @@
11
import { describe, expect, it } from 'vitest';
2-
import { convertMacCISCO, convertMacCanonical, convertMacCanonicalIEEE, convertMacCanonicalIETF } from './mac-address-converter.service';
2+
import {
3+
convertMacCISCO, convertMacCanonical,
4+
convertMacCanonicalIEEE, convertMacCanonicalIETF,
5+
convertMacToEUI64CISCO, convertMacToEUI64CanonicalIEEE,
6+
convertMacToEUI64CanonicalIETF, convertMacToLinkLocalIPv6,
7+
convertMacToNumber,
8+
} from './mac-address-converter.service';
39

410
describe('mac-address-converter', () => {
511
it('Convert MAC Address to given format', async () => {
612
expect(convertMacCanonical('')).to.equal('');
713

8-
const macValue = 'AA:BB:CC:DD:EE:FF';
14+
const macValue = '00:0a:95:9d:68:16';
915

10-
expect(convertMacCanonicalIETF(macValue)).to.equal('aa:bb:cc:dd:ee:ff');
11-
expect(convertMacCanonical(macValue)).to.equal('AA.BB.CC.DD.EE.FF');
12-
expect(convertMacCanonicalIEEE(macValue)).to.equal('AA-BB-CC-DD-EE-FF');
13-
expect(convertMacCISCO(macValue)).to.equal('aabb.ccdd.eeff');
16+
expect(convertMacCanonicalIETF(macValue)).to.equal('00:0a:95:9d:68:16');
17+
expect(convertMacCanonical(macValue)).to.equal('00.0a.95.9d.68.16');
18+
expect(convertMacCanonicalIEEE(macValue)).to.equal('00-0A-95-9D-68-16');
19+
expect(convertMacCISCO(macValue)).to.equal('000a.959d.6816');
20+
21+
expect(convertMacToEUI64CanonicalIETF(macValue, true)).to.equal('02:0a:95:ff:fe:9d:68:16');
22+
expect(convertMacToEUI64CanonicalIETF(macValue, false)).to.equal('00:0a:95:ff:fe:9d:68:16');
23+
expect(convertMacToEUI64CanonicalIEEE(macValue, true)).to.equal('02-0A-95-FF-FE-9D-68-16');
24+
expect(convertMacToEUI64CanonicalIEEE(macValue, false)).to.equal('00-0A-95-FF-FE-9D-68-16');
25+
expect(convertMacToEUI64CISCO(macValue, true)).to.equal('020a.95ff.fe9d.6816');
26+
expect(convertMacToEUI64CISCO(macValue, false)).to.equal('000a.95ff.fe9d.6816');
27+
expect(convertMacToNumber(macValue)).to.equal(45459793942);
28+
expect(convertMacToLinkLocalIPv6(macValue)).to.equal(':fe80::20a:95ff:fe9d:6816');
1429
});
1530
});

src/tools/mac-address-converter/mac-address-converter.service.ts

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,48 @@ function convertMac(mac: string, group: number = 2, char: string = ':'): string
33
return mac.match(new RegExp(`.{1,${group}}`, 'g'))?.join(char) || '';
44
}
55

6+
function convertMacToEUI64(mac: string, ipv6: boolean) {
7+
const macIETF = convertMac(mac);
8+
// Split the MAC address into an array of hex values
9+
const macArray = macIETF.split(':').map(hex => Number.parseInt(hex, 16));
10+
11+
// For IPv6, invert the 7th bit of the first byte
12+
if (ipv6) {
13+
macArray[0] ^= 0x02;
14+
}
15+
16+
// Insert FFFE in the middle
17+
const eui64Array = [
18+
macArray[0], macArray[1], macArray[2],
19+
0xFF, 0xFE,
20+
macArray[3], macArray[4], macArray[5],
21+
];
22+
23+
// Convert the array to a colon-separated string
24+
const eui64 = eui64Array.map(byte => byte.toString(16).padStart(2, '0')).join(':');
25+
26+
// Group into IPv6 EUI-64 format (XXXX:XXFF:FEXX:XXXX)
27+
return eui64.replace(/:/g, '').match(/.{1,4}/g)!.join(':');
28+
}
29+
30+
export function convertMacToEUI64CanonicalIETF(mac: string, ipv6: boolean) {
31+
return convertMac(convertMacToEUI64(mac, ipv6).toLocaleLowerCase());
32+
}
33+
export function convertMacToEUI64CanonicalIEEE(mac: string, ipv6: boolean) {
34+
return convertMac(convertMacToEUI64(mac, ipv6).toLocaleUpperCase(), 2, '-');
35+
}
36+
export function convertMacToEUI64CISCO(mac: string, ipv6: boolean) {
37+
return convertMac(convertMacToEUI64(mac, ipv6).toLocaleLowerCase(), 4, '.');
38+
}
39+
export function convertMacToLinkLocalIPv6(mac: string) {
40+
return `:fe80::${convertMac(convertMacToEUI64(mac, true).toLocaleLowerCase(), 4, ':').replace(/^0/g, '')}`;
41+
}
42+
43+
export function convertMacToNumber(mac: string) {
44+
mac = mac.replace(/[\W_]+/g, '');
45+
return Number.parseInt(mac, 16);
46+
}
47+
648
export function convertMacCanonicalIETF(mac: string): string {
749
return convertMac(mac.toLocaleLowerCase());
850
};

src/tools/mac-address-converter/mac-address-converter.vue

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<script setup lang="ts">
22
import InputCopyable from '../../components/InputCopyable.vue';
3-
import { convertMacCISCO, convertMacCanonical, convertMacCanonicalIEEE, convertMacCanonicalIETF } from './mac-address-converter.service';
3+
import {
4+
convertMacCISCO, convertMacCanonical,
5+
convertMacCanonicalIEEE, convertMacCanonicalIETF,
6+
convertMacToEUI64CISCO, convertMacToEUI64CanonicalIEEE,
7+
convertMacToEUI64CanonicalIETF, convertMacToLinkLocalIPv6,
8+
convertMacToNumber,
9+
} from './mac-address-converter.service';
410
511
const input = ref('AA:BB:CC:DD:EE:FF');
612
@@ -21,6 +27,42 @@ const formats = computed(() => [
2127
label: 'Cisco:',
2228
value: convertMacCISCO(input.value),
2329
},
30+
{
31+
label: 'Hex:',
32+
value: convertMacToNumber(input.value).toString(16),
33+
},
34+
{
35+
label: 'Decimal:',
36+
value: convertMacToNumber(input.value).toString(10),
37+
},
38+
{
39+
label: 'EUI-64 Canonical IETF Format:',
40+
value: convertMacToEUI64CanonicalIETF(input.value, false),
41+
},
42+
{
43+
label: 'EUI-64 Canonical IEEE Format:',
44+
value: convertMacToEUI64CanonicalIEEE(input.value, false),
45+
},
46+
{
47+
label: 'EUI-64 Cisco:',
48+
value: convertMacToEUI64CISCO(input.value, false),
49+
},
50+
{
51+
label: 'EUI-64 IPv6 Canonical IETF Format:',
52+
value: convertMacToEUI64CanonicalIETF(input.value, true),
53+
},
54+
{
55+
label: 'EUI-64 IPv6 Canonical IEEE Format:',
56+
value: convertMacToEUI64CanonicalIEEE(input.value, true),
57+
},
58+
{
59+
label: 'EUI-64 IPv6 Cisco:',
60+
value: convertMacToEUI64CISCO(input.value, true),
61+
},
62+
{
63+
label: 'Link-Local IPv6:',
64+
value: convertMacToLinkLocalIPv6(input.value),
65+
},
2466
]);
2567
2668
const inputLabelAlignmentConfig = {

0 commit comments

Comments
 (0)